Eliminate some branch differences Eliminate more branch differences with main Fixed missing model for npc_citizen in Hammer (FGD) SMG1 ejects rifle shells, not pistol ones