Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Fixes 1653
Projectiles now have a layer threshold 2.75 which is the spiderlings layer.
Fixes issue 2560 - blueprint photos not counting for objectives

wow lets use the same name for our object variables and all our arguments and parameters this will never make things terrible
ever
Grill bugfix
Merge pull request #2620 from Razharas/master

Adding myself to this game master list
Adds crlf default to .gitattributes for most text file types we use.

Massive green/red is to the best of my knowledge caused by files being nearly entirely LF.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #2544 from Mloc/tg-crlf

Adds crlf default to .gitattributes for most text file types we use.
Apparently I suck at git.

Removes some things that got accidentally added.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #2623 from Mloc/tg-crlf

Apparently I suck at git.
Merge pull request #2608 from Cheridan/papersplease

Fixes issue 2560 - blueprint photos not counting for objectives
Merge pull request #2607 from adrix89/Fix_1653

Fix 1653
What the fuck is this i dont even

Seriously git what the hell is that