Anyhow, it's a bit overdue, but the weapons have been submitted (xa-hpwep03a.pk3), and should be compatible with the new .pk3 now. Let me know if you have any trouble with it, Gez -- I think I'm not missing anything important, but as I said, I'm not exactly renowned for having excellent memory. :P
I merged them without problem. The only issue was that the crossbow ammo clones ended up being declared in two different places because they were also in ammo.txt.
Since I did not see any redrawn ammo sprites (I'm not talking about the medium ammo ones), I just ended up cleaning out all those BlahblahAmmo2/BlahblahHefty2 actors that were just changing the scale for no discernible reason.
Have to say, though I'm happy with Silverspring Docks' placement now, the music isn't going to work. 14 megabytes for a small map is seriously excessive, and even if it's scaled down like H1M7/H1M8's music, I really don't care much for it anyway since it's just generic ambience and nothing catchy -- even if it is from the original game.
I agree, and I remember the rule is still "no more than 1 meg of music per map", so I removed it.
I also optimized all new PNG sprites. Still, the archive remains significantly larger than build 47. I'm not sure what takes up so much space.