Merge branch 'upstream/master'
colons removed, thanks RR
Finalizes the fixes.
Slime changelog update
Merge pull request #3712 from Ikarrus/overeyefix

Over-eye hair sprite improvements
What did I break
Dammit
Merge pull request #3766 from Kelenius/OfSlimesAndChangelogs

[CHANGELOG] Of slimes and changelogs
Dodgeballs now call the super code so they can be caught, theoretically deal real impact damage, and they actually give messages on hit.  Fixes #1063, and makes dodgeball not so eerily quiet.  Also fixes "too large to fit in this the backpack" in storage.dm.
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays
Merge pull request #3655 from Rolan7/Issue236_Trays

Makes trays a subclass of bag.
Adds a cool-down for Hostile Lockdown.
Optimization changes

Adds all doors to the "portals" list.
Merge pull request #3729 from Ikarrus/immovablerod

Fixes Immovable Rod
Merge pull request #3732 from AlexanderUlanH/baccano

Fixed ling regeneration bugs
Merge pull request #3720 from hornygranny/readingrainbow

carved books now turn into storage items
Merge pull request #3713 from Ikarrus/whywouldyoudothissteelpoint

[MAP] Fixed AI sat foyer controls starting disabled despite the turrets inside starting on
Merge pull request #3688 from phil235/FireAlarmPowerF

Fixes Fire Alarms activating without power
Merge pull request #3741 from Rolan7/Issue3643-NoclientIcons

Sets screenloc even if no client
Merge pull request #3747 from hornygranny/karmachameleon

Fixes #3744