Hopefully merge conflict fixes
Merge branch 'therenohammershowdoyouusenails' of https://github.com/Jordie0608/-tg-station into therenohammershowdoyouusenails
some giterror i dont understand