Manually Merged Map's Masterpiece

2021-10-12 15:06:05 -05:00
parent 84e7e0da3f
commit 4269ecff65
81 changed files with 1430 additions and 228 deletions
--- a/game/audio/OST/bad_music.ogg
+++ b/game/audio/OST/bad_music.ogg
--- a/game/audio/OST/this_hurts.ogg
+++ b/game/audio/OST/this_hurts.ogg
--- a/game/audio/effects/alarmAirraidSiren.ogg
+++ b/game/audio/effects/alarmAirraidSiren.ogg
--- a/game/audio/effects/alarmClicheLoop.ogg
+++ b/game/audio/effects/alarmClicheLoop.ogg
--- a/game/audio/effects/alarmClock.ogg
+++ b/game/audio/effects/alarmClock.ogg
--- a/game/audio/effects/alarmKlaxonLoop.ogg
+++ b/game/audio/effects/alarmKlaxonLoop.ogg
--- a/game/audio/effects/alarmPoliceSiren.ogg
+++ b/game/audio/effects/alarmPoliceSiren.ogg
--- a/game/audio/effects/alarmSirenLoop.ogg
+++ b/game/audio/effects/alarmSirenLoop.ogg
--- a/game/audio/effects/anonDink.ogg
+++ b/game/audio/effects/anonDink.ogg
--- a/game/audio/effects/anonDumbassFall.ogg
+++ b/game/audio/effects/anonDumbassFall.ogg
--- a/game/audio/effects/anonGardenFall.ogg
+++ b/game/audio/effects/anonGardenFall.ogg
--- a/game/audio/effects/anonShooterFall.ogg
+++ b/game/audio/effects/anonShooterFall.ogg
--- a/game/audio/effects/anonTheaterFall.ogg
+++ b/game/audio/effects/anonTheaterFall.ogg
--- a/game/audio/effects/apartmentLoop.ogg
+++ b/game/audio/effects/apartmentLoop.ogg
--- a/game/audio/effects/beachLoop1.ogg
+++ b/game/audio/effects/beachLoop1.ogg
--- a/game/audio/effects/beachLoop2.ogg
+++ b/game/audio/effects/beachLoop2.ogg
--- a/game/audio/effects/carAlarmLoop.ogg
+++ b/game/audio/effects/carAlarmLoop.ogg
--- a/game/audio/effects/carKick1.ogg
+++ b/game/audio/effects/carKick1.ogg
--- a/game/audio/effects/carKick2.ogg
+++ b/game/audio/effects/carKick2.ogg
--- a/game/audio/effects/carKick3.ogg
+++ b/game/audio/effects/carKick3.ogg
--- a/game/audio/effects/carSuspension1.ogg
+++ b/game/audio/effects/carSuspension1.ogg
--- a/game/audio/effects/carSuspension2.ogg
+++ b/game/audio/effects/carSuspension2.ogg
--- a/game/audio/effects/carSuspension3.ogg
+++ b/game/audio/effects/carSuspension3.ogg
--- a/game/audio/effects/carSuspension4.ogg
+++ b/game/audio/effects/carSuspension4.ogg
--- a/game/audio/effects/cityLoop.ogg
+++ b/game/audio/effects/cityLoop.ogg
--- a/game/audio/effects/classroomLoop.ogg
+++ b/game/audio/effects/classroomLoop.ogg
--- a/game/audio/effects/crowdCheerLoop.ogg
+++ b/game/audio/effects/crowdCheerLoop.ogg
--- a/game/audio/effects/crowdClapLoop.ogg
+++ b/game/audio/effects/crowdClapLoop.ogg
--- a/game/audio/effects/dinomoesLoop.ogg
+++ b/game/audio/effects/dinomoesLoop.ogg
--- a/game/audio/effects/doorSlam.ogg
+++ b/game/audio/effects/doorSlam.ogg
--- a/game/audio/effects/drizzleLoop.ogg
+++ b/game/audio/effects/drizzleLoop.ogg
--- a/game/audio/effects/fangPunch.ogg
+++ b/game/audio/effects/fangPunch.ogg
--- a/game/audio/effects/heartbeat.ogg
+++ b/game/audio/effects/heartbeat.ogg
--- a/game/audio/effects/hungryBeast.ogg
+++ b/game/audio/effects/hungryBeast.ogg
--- a/game/audio/effects/lockerAnonsDead.ogg
+++ b/game/audio/effects/lockerAnonsDead.ogg
--- a/game/audio/effects/lockerSmash.ogg
+++ b/game/audio/effects/lockerSmash.ogg
--- a/game/audio/effects/marketLoop.ogg
+++ b/game/audio/effects/marketLoop.ogg
--- a/game/audio/effects/nightLoop.ogg
+++ b/game/audio/effects/nightLoop.ogg
--- a/game/audio/effects/orange.ogg
+++ b/game/audio/effects/orange.ogg
--- a/game/audio/effects/outdoorLoop.ogg
+++ b/game/audio/effects/outdoorLoop.ogg
--- a/game/audio/effects/outdoorNatureLoop.ogg
+++ b/game/audio/effects/outdoorNatureLoop.ogg
--- a/game/audio/effects/paAlertReverb.ogg
+++ b/game/audio/effects/paAlertReverb.ogg
--- a/game/audio/effects/policeSirensLoop.ogg
+++ b/game/audio/effects/policeSirensLoop.ogg
--- a/game/audio/effects/policeSirensReverbLoop.ogg
+++ b/game/audio/effects/policeSirensReverbLoop.ogg
--- a/game/audio/effects/promChatterLoop1.ogg
+++ b/game/audio/effects/promChatterLoop1.ogg
--- a/game/audio/effects/promChatterLoop2.ogg
+++ b/game/audio/effects/promChatterLoop2.ogg
--- a/game/audio/effects/radioChatterLoop.ogg
+++ b/game/audio/effects/radioChatterLoop.ogg
--- a/game/audio/effects/rainLoop.ogg
+++ b/game/audio/effects/rainLoop.ogg
--- a/game/audio/effects/rainStart.ogg
+++ b/game/audio/effects/rainStart.ogg
--- a/game/audio/effects/rooftopDoorSmash.ogg
+++ b/game/audio/effects/rooftopDoorSmash.ogg
--- a/game/audio/effects/schoolLoop.ogg
+++ b/game/audio/effects/schoolLoop.ogg
--- a/game/audio/effects/schoolSilentLoop.ogg
+++ b/game/audio/effects/schoolSilentLoop.ogg
--- a/game/audio/effects/shotTinnitus.ogg
+++ b/game/audio/effects/shotTinnitus.ogg
--- a/game/audio/effects/showerLoop.ogg
+++ b/game/audio/effects/showerLoop.ogg
--- a/game/audio/effects/showerMuffledEnd.ogg
+++ b/game/audio/effects/showerMuffledEnd.ogg
--- a/game/audio/effects/showerMuffledLoop.ogg
+++ b/game/audio/effects/showerMuffledLoop.ogg
--- a/game/audio/effects/showerStart.ogg
+++ b/game/audio/effects/showerStart.ogg
--- a/game/audio/effects/sizzle.ogg
+++ b/game/audio/effects/sizzle.ogg
--- a/game/audio/effects/slapstickGlassBreak.ogg
+++ b/game/audio/effects/slapstickGlassBreak.ogg
--- a/game/audio/effects/slapstickThunder.ogg
+++ b/game/audio/effects/slapstickThunder.ogg
--- a/game/audio/effects/slapstickWipe.ogg
+++ b/game/audio/effects/slapstickWipe.ogg
--- a/game/audio/effects/spearYellRumbleVoicePA.ogg
+++ b/game/audio/effects/spearYellRumbleVoicePA.ogg
--- a/game/audio/effects/tableSlam.ogg
+++ b/game/audio/effects/tableSlam.ogg
--- a/game/audio/effects/teenageCafeteriaLoop.ogg
+++ b/game/audio/effects/teenageCafeteriaLoop.ogg
--- a/game/audio/effects/teenageCrowdInteriorLoop.ogg
+++ b/game/audio/effects/teenageCrowdInteriorLoop.ogg
--- a/game/audio/effects/teenageCrowdJeerLoop.ogg
+++ b/game/audio/effects/teenageCrowdJeerLoop.ogg
--- a/game/audio/effects/teenageCrowdLoop.ogg
+++ b/game/audio/effects/teenageCrowdLoop.ogg
--- a/game/audio/effects/teenageCrowdMurmurLoop.ogg
+++ b/game/audio/effects/teenageCrowdMurmurLoop.ogg
--- a/game/audio/effects/tireSqueal.ogg
+++ b/game/audio/effects/tireSqueal.ogg
--- a/game/audio/effects/windLightLoop.ogg
+++ b/game/audio/effects/windLightLoop.ogg
--- a/game/audio/effects/windShooterLoop.ogg
+++ b/game/audio/effects/windShooterLoop.ogg
--- a/game/audio/effects/windStart.ogg
+++ b/game/audio/effects/windStart.ogg
--- a/game/audio/effects/woodSnap.ogg
+++ b/game/audio/effects/woodSnap.ogg