21 files changed, 92 insertions, 125 deletions
diff --git a/Makefile b/Makefile
index ae9e7a0..7091542 100644
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,9 @@ MAP ?= analmango
 # Creating a .pk3 with all the assets
 #
 
-analmango.pk3: $(WHOLE).bsp
-	xargs zip -r9 analmango.pk3 < pk3.list
+PK3 ?= analmango.pk3
+$(PK3): $(WHOLE).bsp
+	cat pk3.list | (while read ent; do echo $$ent; done) | xargs zip -r9 $(PK3)
 
 #
 # Testing a map
diff --git a/maps/p3_dretchpwner.map b/maps/p3_dretchpwner.map
index d7b5dfc..85db6d9 100644
--- a/maps/p3_dretchpwner.map
+++ b/maps/p3_dretchpwner.map
@@ -1928,14 +1928,6 @@ nexus6/brown_hose_s
 }
 // entity 39
 {
-"classname" "target_speaker"
-"origin" "-1632.000000 -160.000000 -192.000000"
-"noise" "sound/analmango/pwner_out.wav"
-"targetname" "global_ann_pwner_out"
-"angle" "-179.999985"
-}
-// entity 40
-{
 "classname" "trigger_multiple"
 "target" "pwner_once"
 "wait" "-1"
@@ -1949,7 +1941,7 @@ nexus6/brown_hose_s
 ( -1880 96 -64 ) ( -1872 96 -64 ) ( -1880 96 64 ) common/trigger -0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 41
+// entity 40
 {
 "classname" "target_print"
 "origin" "-2256.000000 -328.000000 -256.000000"
@@ -1957,31 +1949,31 @@ nexus6/brown_hose_s
 "targetname" "pwner_once"
 "angle" "-179.999985"
 }
-// entity 42
+// entity 41
 {
 "classname" "team_human_spawn"
 "origin" "-2240.000000 -152.000000 -312.000000"
 "mapcat_discard" " "
 }
-// entity 43
+// entity 42
 {
 "classname" "info_alien_intermission"
 "origin" "-2304.000000 -128.000000 -248.000000"
 "mapcat_discard" " "
 }
-// entity 44
+// entity 43
 {
 "classname" "info_human_intermission"
 "origin" "-2304.000000 -152.000000 -248.000000"
 "mapcat_discard" " "
 }
-// entity 45
+// entity 44
 {
 "classname" "info_player_intermission"
 "origin" "-2304.000000 -176.000000 -248.000000"
 "mapcat_discard" " "
 }
-// entity 46
+// entity 45
 {
 "classname" "func_door"
 "angle" "-1"
@@ -2008,13 +2000,13 @@ nexus6/brown_hose_s
 ( -2216 -336 -320 ) ( -2216 -400 -320 ) ( -2216 -336 -160 ) common/caulk 48 16 0 -0.5 0.5 0 0 0
 }
 }
-// entity 47
+// entity 46
 {
 "classname" "team_alien_spawn"
 "origin" "-1832.000000 320.000000 -296.000000"
 "mapcat_discard" " "
 }
-// entity 48
+// entity 47
 {
 "classname" "func_door"
 "angle" "-2"
@@ -2042,7 +2034,7 @@ nexus6/brown_hose_s
 ( -1856 -88 -464 ) ( -1856 -72 -464 ) ( -1856 -88 -416 ) niveus/cable 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 49
+// entity 48
 {
 "classname" "func_door"
 "angle" "-2"
@@ -2070,7 +2062,7 @@ nexus6/brown_hose_s
 ( -1868 -220 -416 ) ( -1868 -204 -416 ) ( -1868 -220 -408 ) niveus/floor_trim 16 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 50
+// entity 49
 {
 "classname" "func_door"
 "angle" "-2"
@@ -2098,7 +2090,7 @@ nexus6/brown_hose_s
 ( -1856 -120 -464 ) ( -1840 -120 -464 ) ( -1856 -120 -416 ) niveus/cable 0 0 90 0.5 0.5 134217728 0 0
 }
 }
-// entity 51
+// entity 50
 {
 "classname" "func_button"
 "target" "func_door1"
@@ -2115,7 +2107,7 @@ nexus6/brown_hose_s
 ( -1868 -88 -512 ) ( -1868 -72 -512 ) ( -1868 -88 -464 ) nexus6/proto_lightred_64_300 32 32 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 52
+// entity 51
 {
 "classname" "func_button"
 "target" "func_door5"
@@ -2132,7 +2124,7 @@ nexus6/brown_hose_s
 ( -1868 -156 -512 ) ( -1868 -140 -512 ) ( -1868 -156 -464 ) nexus6/proto_lightred_64_300 48 32 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 53
+// entity 52
 {
 "classname" "func_button"
 "target" "func_door6"
@@ -2150,7 +2142,7 @@ nexus6/brown_hose_s
 ( -1832 -236 -512 ) ( -1848 -236 -512 ) ( -1832 -236 -464 ) nexus6/proto_lightred_64_300 32 32 0 -0.25 0.25 134217728 0 0
 }
 }
-// entity 54
+// entity 53
 {
 "classname" "func_button"
 "target" "func_door2"
@@ -2167,7 +2159,7 @@ nexus6/brown_hose_s
 ( -1764 -280 -444 ) ( -1764 -264 -444 ) ( -1764 -280 -396 ) nexus6/proto_lightred_64_300 32 48 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 55
+// entity 54
 {
 "classname" "func_door"
 "angle" "270"
@@ -2195,7 +2187,7 @@ nexus6/brown_hose_s
 ( -1764 -200 -324 ) ( -1724 -208 -324 ) ( -1764 -208 -324 ) niveus/floor_trim 192 0 0 -0.5 0.5 134217728 0 0
 }
 }
-// entity 56
+// entity 55
 {
 "classname" "func_button"
 "health" "1"
@@ -2212,7 +2204,7 @@ nexus6/brown_hose_s
 ( -1764 -160 -428 ) ( -1764 -144 -428 ) ( -1764 -160 -380 ) nexus6/proto_lightred_64_300 0 48 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 57
+// entity 56
 {
 "classname" "func_door"
 "spawnflags" "5"
@@ -2240,7 +2232,7 @@ nexus6/brown_hose_s
 ( -1764 -156 -332 ) ( -1764 -140 -332 ) ( -1764 -156 -324 ) niveus/floor_trim 144 8 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 58
+// entity 57
 {
 "classname" "func_button"
 "target" "func_door4"
@@ -2257,7 +2249,7 @@ nexus6/brown_hose_s
 ( -1764 -216 -332 ) ( -1764 -200 -332 ) ( -1764 -216 -284 ) nexus6/proto_lightred_64_300 32 48 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 59
+// entity 58
 {
 "classname" "func_door"
 "angle" "270"
@@ -2285,7 +2277,7 @@ nexus6/brown_hose_s
 ( -1764 -120 -296 ) ( -1764 -120 -312 ) ( -1764 -112 -296 ) niveus/floor_trim 8 16 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 60
+// entity 59
 {
 "classname" "func_button"
 "health" "1"
@@ -2302,7 +2294,7 @@ nexus6/brown_hose_s
 ( -1764 -96 -280 ) ( -1764 -80 -280 ) ( -1764 -96 -232 ) nexus6/proto_lightred_64_300 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 61
+// entity 60
 {
 "classname" "func_door"
 "angle" "-1"
@@ -2330,7 +2322,7 @@ nexus6/brown_hose_s
 ( -1764 -68 -468 ) ( -1764 -108 -468 ) ( -1764 -108 -476 ) niveus/floor_trim 176 8 180 0.5 0.5 134217728 0 0
 }
 }
-// entity 62
+// entity 61
 {
 "classname" "func_button"
 "angle" "90"
@@ -2348,7 +2340,7 @@ nexus6/brown_hose_s
 ( -1684 -180 -492 ) ( -1700 -180 -492 ) ( -1684 -180 -444 ) nexus6/proto_lightred_64_300 48 48 0 -0.25 0.25 134217728 0 0
 }
 }
-// entity 63
+// entity 62
 {
 "classname" "func_door"
 "angle" "270"
@@ -2375,7 +2367,7 @@ nexus6/brown_hose_s
 ( -1712 -80 -456 ) ( -1712 -80 -472 ) ( -1712 -72 -456 ) niveus/floor_trim 200 0 -90 0.5 0.5 134217728 0 0
 }
 }
-// entity 64
+// entity 63
 {
 "classname" "func_door"
 "angle" "-2"
@@ -2392,7 +2384,7 @@ nexus6/brown_hose_s
 ( -1660 -344 -504 ) ( -1660 -64 -504 ) ( -1660 -344 -488 ) nexus6/ind-corr-metal-1 0 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 65
+// entity 64
 {
 "classname" "func_door"
 "health" "1"
@@ -2419,7 +2411,7 @@ nexus6/brown_hose_s
 ( -1660 -40 -500 ) ( -1660 -24 -500 ) ( -1660 -40 -452 ) nexus6/proto_lightred_64_300 32 16 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 66
+// entity 65
 {
 "classname" "trigger_multiple"
 "target" "func_door10"
@@ -2469,7 +2461,7 @@ nexus6/brown_hose_s
 ( -1664 -344 -248 ) ( -1664 -292 -248 ) ( -1664 -344 -208 ) common/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 67
+// entity 66
 {
 "classname" "func_door"
 "angle" "270"
@@ -2485,22 +2477,7 @@ nexus6/brown_hose_s
 ( -1664 -12 -456 ) ( -1664 28 -480 ) ( -1664 28 -456 ) nexus6/e6dmetal -0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 68
-{
-"classname" "trigger_multiple"
-"target" "global_ann_pwner_out"
-"wait" "30"
-// brush 0
-{
-( -1560 -304 -208 ) ( -1560 -344 -208 ) ( -1584 -304 -208 ) common/trigger 48 0 0 0.5 0.5 134217728 0 0
-( -1560 -304 -208 ) ( -1584 -304 -208 ) ( -1560 -304 -248 ) common/trigger 48 0 0 0.5 0.5 134217728 0 0
-( -1592 -312 -208 ) ( -1592 -312 -248 ) ( -1592 -352 -208 ) common/trigger 16 0 0 0.5 0.5 134217728 0 0
-( -1616 -352 -248 ) ( -1592 -352 -248 ) ( -1616 -312 -248 ) common/trigger 48 48 0 0.5 0.5 134217728 0 0
-( -1584 -344 -248 ) ( -1584 -344 -208 ) ( -1560 -344 -248 ) common/trigger 48 0 0 0.5 0.5 134217728 0 0
-( -1616 -344 -248 ) ( -1616 -304 -248 ) ( -1616 -344 -208 ) common/trigger 0 0 0 0.5 0.5 134217728 0 0
-}
-}
-// entity 69
+// entity 67
 {
 "classname" "trigger_teleport"
 "target" "target_position1"
@@ -2514,14 +2491,14 @@ nexus6/brown_hose_s
 ( -1472 -32 -248 ) ( -1472 -80 -208 ) ( -1472 -80 -248 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 70
+// entity 68
 {
 "classname" "target_position"
 "origin" "-1848.000000 272.000000 -224.000000"
 "angle" "90.000000"
 "targetname" "target_position1"
 }
-// entity 71
+// entity 69
 {
 "classname" "func_button"
 "target" "crushers"
@@ -2536,7 +2513,7 @@ nexus6/brown_hose_s
 ( -1576 -224 -152 ) ( -1576 -176 -240 ) ( -1576 -224 -240 ) niveus/achtung_clang_128 0.0000190735 127.999961853 0 0.375 0.375 134217728 0 0
 }
 }
-// entity 72
+// entity 70
 {
 "classname" "func_door"
 "angle" "-1"
@@ -2564,7 +2541,7 @@ nexus6/brown_hose_s
 ( -2344 -376 -744 ) ( -2344 -232 -744 ) ( -2344 -376 -728 ) niveus/glass_02_s 16 0 45 0.125 0.125 0 0 0
 }
 }
-// entity 73
+// entity 71
 {
 "classname" "func_door"
 "dmg" "13337"
@@ -2592,7 +2569,7 @@ nexus6/brown_hose_s
 ( -2344 -376 108 ) ( -2344 -232 124 ) ( -2344 -376 124 ) niveus/glass_02_s 92.7504348755 435.2495727539 -45 0.125 -0.125 0 0 0
 }
 }
-// entity 74
+// entity 72
 {
 "classname" "func_button"
 "target" "wtf_3"
@@ -2606,7 +2583,7 @@ nexus6/brown_hose_s
 ( -1472 -168 -240 ) ( -1472 -184 -224 ) ( -1472 -184 -240 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 75
+// entity 73
 {
 "classname" "func_button"
 "target" "wtf_2"
@@ -2620,7 +2597,7 @@ nexus6/brown_hose_s
 ( -1472 -136 -240 ) ( -1472 -152 -224 ) ( -1472 -152 -240 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 76
+// entity 74
 {
 "classname" "func_button"
 "target" "wtf_1"
@@ -2634,7 +2611,7 @@ nexus6/brown_hose_s
 ( -1472 -104 -240 ) ( -1472 -120 -224 ) ( -1472 -120 -240 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 77
+// entity 75
 {
 "classname" "target_speaker"
 "origin" "-1520.000000 -40.000000 -232.000000"
@@ -2643,7 +2620,7 @@ nexus6/brown_hose_s
 "angle" "-90.000000"
 "spawnflags" "4"
 }
-// entity 78
+// entity 76
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -144.000000 -232.000000"
@@ -2652,7 +2629,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 79
+// entity 77
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -112.000000 -232.000000"
@@ -2661,7 +2638,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "targetname" "wtf_1"
 }
-// entity 80
+// entity 78
 {
 "classname" "func_door"
 "targetname" "pwner_end_2"
@@ -2678,7 +2655,7 @@ nexus6/brown_hose_s
 ( -1624 -344 -208 ) ( -1624 -304 -208 ) ( -1624 -344 -160 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 81
+// entity 79
 {
 "classname" "func_door"
 "angle" "90"
@@ -2702,7 +2679,7 @@ nexus6/brown_hose_s
 ( -1852 -92 -400 ) ( -1852 -60 -400 ) ( -1852 -92 -384 ) common/nodrawnonsolid 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 82
+// entity 80
 {
 "classname" "func_button"
 "speed" "13337"
@@ -2718,7 +2695,7 @@ nexus6/brown_hose_s
 ( -2000 -8 -412 ) ( -2016 -8 -412 ) ( -2000 -8 -364 ) nexus6/proto_lightred_64_300 0 48 0 -0.25 0.25 134217728 0 0
 }
 }
-// entity 83
+// entity 81
 {
 "classname" "target_relay"
 "origin" "-1960.000000 -48.000000 -380.000000"
@@ -2726,7 +2703,7 @@ nexus6/brown_hose_s
 "target" "target_print1"
 "spawnflags" "2"
 }
-// entity 84
+// entity 82
 {
 "classname" "trigger_hurt"
 "spawnflags" "20"
@@ -2750,7 +2727,7 @@ nexus6/brown_hose_s
 ( -1584 -344 -248 ) ( -1584 -24 -248 ) ( -1584 -344 -208 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 85
+// entity 83
 {
 "classname" "target_relay"
 "origin" "-1960.000000 -16.000000 -380.000000"
@@ -2758,7 +2735,7 @@ nexus6/brown_hose_s
 "target" "func_door11"
 "spawnflags" "1"
 }
-// entity 86
+// entity 84
 {
 "classname" "target_print"
 "origin" "-1960.000000 -80.000000 -384.000000"
@@ -2766,14 +2743,14 @@ nexus6/brown_hose_s
 "message" "A human is needed to activate this."
 "spawnflags" "4"
 }
-// entity 87
+// entity 85
 {
 "classname" "target_position"
 "origin" "-1848.000000 36.000000 -292.000000"
 "angle" "-90.000000"
 "targetname" "target_position3"
 }
-// entity 88
+// entity 86
 {
 "classname" "trigger_multiple"
 "target" "pwner_start"
@@ -2796,14 +2773,14 @@ nexus6/brown_hose_s
 ( -1868 192 -312 ) ( -1868 228 -312 ) ( -1868 192 -272 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 89
+// entity 87
 {
 "classname" "target_teleporter"
 "origin" "-1848.000000 84.000000 -292.000000"
 "target" "target_position3"
 "targetname" "pwner_start"
 }
-// entity 90
+// entity 88
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -176.000000 -232.000000"
@@ -2812,7 +2789,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 91
+// entity 89
 {
 "classname" "func_button"
 "target" "wtf_5"
@@ -2826,7 +2803,7 @@ nexus6/brown_hose_s
 ( -1472 -248 -224 ) ( -1472 -232 -240 ) ( -1472 -232 -224 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 92
+// entity 90
 {
 "classname" "func_button"
 "target" "wtf_6"
@@ -2840,7 +2817,7 @@ nexus6/brown_hose_s
 ( -1472 -280 -224 ) ( -1472 -264 -240 ) ( -1472 -264 -224 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 93
+// entity 91
 {
 "classname" "func_button"
 "target" "wtf_7"
@@ -2854,7 +2831,7 @@ nexus6/brown_hose_s
 ( -1472 -312 -224 ) ( -1472 -296 -240 ) ( -1472 -296 -224 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 94
+// entity 92
 {
 "classname" "func_button"
 "target" "wtf_4"
@@ -2868,7 +2845,7 @@ nexus6/brown_hose_s
 ( -1472 -216 -224 ) ( -1472 -200 -240 ) ( -1472 -200 -224 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 95
+// entity 93
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -208.000000 -232.000000"
@@ -2877,7 +2854,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 96
+// entity 94
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -240.000000 -232.000000"
@@ -2886,7 +2863,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 97
+// entity 95
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -272.000000 -232.000000"
@@ -2895,7 +2872,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 98
+// entity 96
 {
 "classname" "target_speaker"
 "origin" "-1480.000000 -304.000000 -232.000000"
@@ -2904,7 +2881,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 99
+// entity 97
 {
 "classname" "func_button"
 "angle" "270"
@@ -2919,7 +2896,7 @@ nexus6/brown_hose_s
 ( -1512 -336 -224 ) ( -1496 -336 -240 ) ( -1496 -336 -224 ) niveus/achtung_clang_128 112 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 100
+// entity 98
 {
 "classname" "func_button"
 "angle" "270"
@@ -2934,7 +2911,7 @@ nexus6/brown_hose_s
 ( -1544 -336 -224 ) ( -1528 -336 -240 ) ( -1528 -336 -224 ) niveus/achtung_clang_128 48 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 101
+// entity 99
 {
 "classname" "func_button"
 "angle" "90"
@@ -2949,7 +2926,7 @@ nexus6/brown_hose_s
 ( -1560 -32 -240 ) ( -1544 -32 -224 ) ( -1544 -32 -240 ) niveus/achtung_clang_128 48 0 0 -0.5 0.5 134217728 0 0
 }
 }
-// entity 102
+// entity 100
 {
 "classname" "target_speaker"
 "origin" "-1504.000000 -328.000000 -232.000000"
@@ -2958,7 +2935,7 @@ nexus6/brown_hose_s
 "angle" "90.000008"
 "spawnflags" "4"
 }
-// entity 103
+// entity 101
 {
 "classname" "target_speaker"
 "origin" "-1536.000000 -328.000000 -232.000000"
@@ -2967,21 +2944,21 @@ nexus6/brown_hose_s
 "angle" "90.000008"
 "spawnflags" "4"
 }
-// entity 104
+// entity 102
 {
 "classname" "light"
 "origin" "-1536.000000 -184.000000 -224.000000"
 "light" "30"
 "_color" "0 0.971344 0.667796"
 }
-// entity 105
+// entity 103
 {
 "classname" "light"
 "origin" "-1528.000000 -88.000000 -224.000000"
 "light" "30"
 "_color" "0 0.971344 0.667796"
 }
-// entity 106
+// entity 104
 {
 "classname" "target_speaker"
 "origin" "-1552.000000 -40.000000 -232.000000"
@@ -2990,7 +2967,7 @@ nexus6/brown_hose_s
 "angle" "-90.000000"
 "spawnflags" "4"
 }
-// entity 107
+// entity 105
 {
 "classname" "func_button"
 "target" "wtf_11"
@@ -3005,7 +2982,7 @@ nexus6/brown_hose_s
 ( -1528 -32 -240 ) ( -1512 -32 -224 ) ( -1512 -32 -240 ) niveus/achtung_clang_128 112 0 0 -0.5 0.5 134217728 0 0
 }
 }
-// entity 108
+// entity 106
 {
 "classname" "light"
 "origin" "-1536.000000 -280.000000 -224.000000"
diff --git a/maps/p4_thepress.map b/maps/p4_thepress.map
index 382db63..3bdff86 100644
--- a/maps/p4_thepress.map
+++ b/maps/p4_thepress.map
@@ -4135,17 +4135,10 @@ nexus6/barrel_rst_sign
 {
 "classname" "target_speaker"
 "origin" "-168.000000 -1824.000000 120.000000"
-"noise" "sound/analmango/pwner_out.wav"
-"targetname" "global_ann_pwner_out"
-}
-// entity 32
-{
-"classname" "target_speaker"
-"origin" "-168.000000 -1824.000000 120.000000"
 "noise" "sound/analmango/analmango.wav"
 "targetname" "global_ann_analmango"
 }
-// entity 33
+// entity 32
 {
 "classname" "target_speaker"
 "origin" "-168.000000 -1824.000000 120.000000"
diff --git a/maps/p6_engineering.map b/maps/p6_engineering.map
index e3703ec..ee5abec 100644
--- a/maps/p6_engineering.map
+++ b/maps/p6_engineering.map
@@ -5546,30 +5546,23 @@ nexus6/barrel_rst_top
 {
 "classname" "target_speaker"
 "origin" "128.000000 -1080.000000 64.000000"
-"targetname" "global_ann_pwner_out"
-"noise" "sound/analmango/pwner_out.wav"
-}
-// entity 13
-{
-"classname" "target_speaker"
-"origin" "128.000000 -1080.000000 64.000000"
 "targetname" "global_ann_analmango"
 "noise" "sound/analmango/analmango.wav"
 }
-// entity 14
+// entity 13
 {
 "classname" "target_speaker"
 "origin" "128.000000 -1080.000000 64.000000"
 "targetname" "global_ann_pwner_in"
 "noise" "sound/analmango/pwner_in.wav"
 }
-// entity 15
+// entity 14
 {
 "classname" "team_human_spawn"
 "origin" "312.000000 -2712.000000 -584.000000"
 "mapcat_discard" " "
 }
-// entity 16
+// entity 15
 {
 "classname" "func_door"
 "targetname" "antilift_1"
@@ -6278,7 +6271,7 @@ nexus6/barrel_rst_top
 ( -396 -2556 -216 ) ( -396 -2284 -232 ) ( -396 -2556 -232 ) nexus6/e6boltstrip 237.7142944336 8 90 0.5 0.5 0 0 0
 }
 }
-// entity 17
+// entity 16
 {
 "classname" "func_button"
 "angle" "270"
@@ -6299,7 +6292,7 @@ nexus6/barrel_rst_top
 ( 42 -2820 -616 ) ( 46 -2824 -620 ) ( 46 -2820 -620 ) nexus6/blackwall 0 80 0 0.25 0.25 0 0 0
 }
 }
-// entity 18
+// entity 17
 {
 "classname" "func_door"
 "angle" "-1"
@@ -6335,7 +6328,7 @@ 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 19
+// entity 18
 {
 "classname" "func_door"
 "angle" "-1"
@@ -6371,7 +6364,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 20
+// entity 19
 {
 "classname" "func_door"
 "targetname" "func_door1"
@@ -6405,7 +6398,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 21
+// entity 20
 {
 "classname" "trigger_multiple"
 "target" "func_door1"
@@ -6419,27 +6412,27 @@ 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 22
+// entity 21
 {
 "classname" "light"
 "origin" "48.000000 -2752.000000 -360.000000"
 "light" "25"
 "_color" "1 0.0185092 0"
 }
-// entity 23
+// entity 22
 {
 "classname" "team_human_reactor"
 "origin" "416.000000 -2784.000000 -576.000000"
 "mapcat_discard" " "
 }
-// entity 24
+// entity 23
 {
 "classname" "target_speaker"
 "origin" "-8.000000 -2808.000000 -528.000000"
 "noise" "sound/analmango/chaccaron.wav"
 "spawnflags" "1"
 }
-// entity 25
+// entity 24
 {
 "classname" "target_delay"
 "origin" "16.000000 -2720.000000 -576.000000"
@@ -6447,7 +6440,7 @@ nexus6/barrel_rst_top
 "target" "antilift_2b"
 "wait" "2.5"
 }
-// entity 26
+// entity 25
 {
 "classname" "target_delay"
 "origin" "16.000000 -2720.000000 -576.000000"
@@ -6455,14 +6448,14 @@ nexus6/barrel_rst_top
 "target" "antilift_2"
 "wait" "2.5"
 }
-// entity 27
+// entity 26
 {
 "classname" "target_speaker"
 "origin" "48.000000 -2752.000000 -544.000000"
 "noise" "sound/analmango/elevator.wav"
 "targetname" "antilift_15"
 }
-// entity 28
+// entity 27
 {
 "classname" "target_delay"
 "origin" "72.000000 -2720.000000 -544.000000"
@@ -6470,7 +6463,7 @@ nexus6/barrel_rst_top
 "target" "antilift_15"
 "wait" "5.2"
 }
-// entity 29
+// entity 28
 {
 "classname" "target_delay"
 "origin" "72.000000 -2720.000000 -576.000000"
@@ -6478,7 +6471,7 @@ nexus6/barrel_rst_top
 "target" "antilift_15"
 "wait" "0.2"
 }
-// entity 30
+// entity 29
 {
 "classname" "misc_model"
 "origin" "-8.000000 -2808.000000 -512.000000"
@@ -6486,7 +6479,7 @@ nexus6/barrel_rst_top
 "angle" "45.000000"
 "modelscale" "0.600000"
 }
-// entity 31
+// entity 30
 {
 "classname" "func_rotating"
 "spawnflags" "4"
diff --git a/pending/pjw_retard.wav b/pending/pjw_retard.wav
new file mode 100644
index 0000000..6d55fca
--- /dev/null
+++ b/pending/pjw_retard.wav
diff --git a/sound/analmango/radio_tower.wav b/pending/radio_tower.wav
index ceb98b0..ceb98b0 100644
--- a/sound/analmango/radio_tower.wav
+++ b/pending/radio_tower.wav
diff --git a/pk3.list b/pk3.list
index 7cf9c6b..fb3f2da 100644
--- a/pk3.list
+++ b/pk3.list
@@ -1,6 +1,9 @@
 maps/analmango.bsp
 scripts/
 sound/
+models/mapobjects/analmango/falling_box.md3
+models/mapobjects/analmango/*.jpg
+models/mapobjects/analmango/*.tga
 textures/analmango
 textures/uncommon
 README
diff --git a/sound/analmango/clock_l.wav b/sound/analmango/clock_l.wav
index 32965a4..4aa743c 100644
--- a/sound/analmango/clock_l.wav
+++ b/sound/analmango/clock_l.wav
diff --git a/sound/analmango/clock_r.wav b/sound/analmango/clock_r.wav
index 26f3e0a..800d090 100644
--- a/sound/analmango/clock_r.wav
+++ b/sound/analmango/clock_r.wav
diff --git a/sound/analmango/elevator.wav b/sound/analmango/elevator.wav
index 7ea5f3c..1ab412a 100644
--- a/sound/analmango/elevator.wav
+++ b/sound/analmango/elevator.wav
diff --git a/sound/analmango/hpc.wav b/sound/analmango/hpc.wav
index 4033c6c..342c636 100644
--- a/sound/analmango/hpc.wav
+++ b/sound/analmango/hpc.wav
diff --git a/sound/analmango/pwner_out.wav b/sound/analmango/pwner_out.wav
deleted file mode 100644
index d1de55b..0000000
--- a/sound/analmango/pwner_out.wav
+++ /dev/null
diff --git a/sound/analmango/wtf_1.wav b/sound/analmango/wtf_1.wav
index 65d7a09..3c53bf3 100644
--- a/sound/analmango/wtf_1.wav
+++ b/sound/analmango/wtf_1.wav
diff --git a/sound/analmango/wtf_2.wav b/sound/analmango/wtf_2.wav
index 0bb389a..25724b6 100644
--- a/sound/analmango/wtf_2.wav
+++ b/sound/analmango/wtf_2.wav
diff --git a/sound/analmango/wtf_3.wav b/sound/analmango/wtf_3.wav
index f935a4d..e0f38cd 100644
--- a/sound/analmango/wtf_3.wav
+++ b/sound/analmango/wtf_3.wav
diff --git a/sound/analmango/wtf_4.wav b/sound/analmango/wtf_4.wav
index 5d41c1d..1c70110 100644
--- a/sound/analmango/wtf_4.wav
+++ b/sound/analmango/wtf_4.wav
diff --git a/sound/analmango/wtf_5.wav b/sound/analmango/wtf_5.wav
index 3fb6777..b1a87b7 100644
--- a/sound/analmango/wtf_5.wav
+++ b/sound/analmango/wtf_5.wav
diff --git a/sound/analmango/wtf_6.wav b/sound/analmango/wtf_6.wav
index 61ff73c..fa48307 100644
--- a/sound/analmango/wtf_6.wav
+++ b/sound/analmango/wtf_6.wav
diff --git a/sound/analmango/wtf_7.wav b/sound/analmango/wtf_7.wav
index d3080e2..145a040 100644
--- a/sound/analmango/wtf_7.wav
+++ b/sound/analmango/wtf_7.wav
diff --git a/sound/analmango/wtf_8.wav b/sound/analmango/wtf_8.wav
index d1b8a34..6d6ba1c 100644
--- a/sound/analmango/wtf_8.wav
+++ b/sound/analmango/wtf_8.wav
diff --git a/sound/analmango/wtf_9.wav b/sound/analmango/wtf_9.wav
index bcf9dc6..30c6906 100644
--- a/sound/analmango/wtf_9.wav
+++ b/sound/analmango/wtf_9.wav