Fixes #2627 and line endings (?).
Nitpick, ho!
Merge branch 'master' of https://github.com/tkdrg/-tg-station into ultrahardelitebugfix

Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
Now with 100% more procs!
Merge pull request #2645 from tkdrg/ultrahardelitebugfix

Bugfix for #2627