New York lawmakers are set to vote on gun laws that would ban weapons from a long list of "sensitive places", including Times Square.
The legislation would also require people who want a gun licence to get more training and submit their social media accounts to government review.
The emergency legislative session began on Thursday, a week after the Supreme Court's conservative majority struck down New York's restrictive gun-licence laws and ruled for the first time that the US Constitution grants an individual the right to carry weapons in public for self-defence.
New York's Democratic leaders have lambasted the ruling, saying there will be more gun violence if there are more people carrying guns.
They have conceded they must now loosen the state's century-old permit scheme but are aiming to keep as many restrictions as they can in the name of public safety, which may end up a target for more legal challenges.
The court ruled the law legislators are changing gave too much discretion to officials to deny a permit.
In the early hours of Friday, the state government released the text of a bill that included a list of proposed sensitive places.
It included government buildings, medical facilities, places of worship, libraries, playgrounds, parks, zoos, schools, colleges, summer camps, addiction-support centres, homeless shelters, nursing homes, public transit including the New York City subway, places where alcohol or marijuana is consumed, museums, theatres, stadiums and other venues, polling places and Times Square.
The Senate passed the Concealed-Carry Improvement Bill 43-20 in a party-line vote on Friday afternoon after hours of debate in which Republican lawmakers said the new legislation was too onerous on people trying to exercise a right to carry guns.
The Assembly had begun debate on the bill, but lawmakers said a vote may not be held before Saturday.
If passed, the law would take effect from September 1.
Australian Associated Press
Sign up for our newsletter to stay up to date.