Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Gives fire suits a bit of extra cold protection over normal armor.

I set it to 60, so you can't use fire suits like the ghetto space suits of old (which would be impossible to emulate now, back then coldness did only negligible damage) but it is enough for atmostechs to clean up a medbay cryo leak, and they will protect you long enough for the ballsy atmos tech to plug a hullbreach, or gives an unlucky engineer about a minute thirty to wire a solar array.
The automatic shuttle call will now be triggered if there are no communications console on the station z level or an active AI. The shuttle will not have the standard 10 minutes to arrive, instead, it will take 25 minutes, so they have 20 minutes to recall.

They will use the new proc autoshuttlecall() in the emergency_shuttle controller.

Instead of taking a loop on world, there's a new list, shuttle_caller_list, it includes all communication consoles and AIs.

Fixed some weird things regarding recalling the shuttle if the arriving time of the shuttle was bigger than 10 minutes.
Nghhh
Merge branch 'master' of https://github.com/Malkevin/-tg-station into coldfiresuit

Conflicts:
	code/_compile_options.dm
Changes the name of some of the slime colours so that they can be parsed by erro's stat tracking stuff.
Merge branch 'master' of https://github.com/tgstation/-tg-station
comment change for mr pedantic
Revert "Merge branch 'master' of https://github.com/tgstation/-tg-station"

This reverts commit f3bd3680cc46217576b57b24b034764f3fcc89f0, reversing
changes made to 67d5641ad6f64e5d8ab6fc8daa9de738cd040b10.
Gives fly people a buzz lisp (lenghtens "z"s)
Fixes a spelling error in gender_reassignment.dm I missed when I wrote it
MAKESHIFT WEAPONS UPDATE
-Removes stungloves and all related code.
-Makeshift stun batons can be made in their stead, along with spears. Spears can be thrown or used one or two-handed.
-Major stun baton revamp. They now accept batteries, which can be removed and replaced.
-Fixes the bug where you could use TK to make a dualsaber from a single saber.
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
Commitin' the stuff that didn't merge
dear diary today i removeb stunglubs i'm a hero
 * Changelog for non-vocal AI/Cyborgs.
Lowercased and fixed a typo for the prisoner management console
Merge pull request #391 from Petethegoat/typofix

Lowercased and fixed a typo for the prisoner management console
Adds client checks to update_inv procs, before trying to reference client.screen.
Merge pull request #389 from Giacomand/silentBorgAI

Changelog for non-vocal AI/Cyborgs.