Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Telecrystal Management Consoles

Designed for Nuke Ops, these two consoles work to allow a nuke team to manage their TC. The TC Stations accept any uplink item. Once the uplink is inserted, they can donate their TC to the group's boss console.

The boss console can then take its TC pool and distribute it among the hooked uplink stations.
It gets an amount of bonus TC based on the round population, allowing nuke op equipment to scale with the increased threat of a fully-manned station.
(and hopefully make gearing up a better experience overall, with no more "WHO'S GOT THE RADIO?!")
Merge branch 'master' of https://github.com/tgstation/-tg-station
Fixes code based on MrPerson's feedback; minor tweaks to formatting and fingerprinting
Reverting these changes
Revert "Reverting these changes"

This reverts commit dcd32654ef5bba85df26dddf341928e990cd44d1.
Adds the blue versions of fashionable security outfits and a crate you can order from cargo that contains 2x officer, 1x warden and 1x HoS outfits. Crate cost 30 supply points is more than standard costume (10 points) and wizard costume crates (20 points), and cheaper than loyalty implant crate (40 points).

Also moves around security clothing items. For example HoS clothing was all in clothing/under/jobs/security, now every piece is in their respective category (under, suits, head). This doesn't change item paths.

Spelling fix in icons/mob/suit.dmi
-Fixes issue 1462
Adds an update icons call to cloakers

-Fixes issue 1387
Clonees get healed of all damage types while in the pod.
Adds a plasma counter hud for aliens that works similar to the changeling's chem storage and blob's resource storage counters.
* Adds the active players for when you are getting the server status.
* Removed the unused player number followed by player name.
Instead of overall health, clonee ejection is based on cloneloss. This eliminates the need for healing (inaprovaline is still injected otherwise they'll die of choking since they start in crit)
Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
Fixed up Scanning Module naming
Replaced the wizard den's bedsheet with the wiz bedsheet.
Updated MetaStation.v37G.II.dmm to MetaStation.v37H.dmm
-Added virology smartfridge.
-Added chemistry smartfridge.
-Added more fire extinguishers to security.
-Added cable coils to chemistry.
-Added more briefcases to the map.
-Added secure briefcases for each head and the detective.
-Added bookbinder and photocopier to library.
-Removed anomalous rwall by janitor's closet.
-Updated maint. doors so they should all unlock correctly when heads use the emergency maint. all-access protocol.
-Updated bomb test site camera so it should no longer runtime.
-Updated the commemorative plaque near arrivals, which now displays the normal message and the map version number.
-Fixed prison monitors just ouside the prison and in the lawyer's office.
-Fixed genetics lab being visible to the public hallway, causing Beepsky to try and attack the monkeys within.
-Turned pumps (but not taps) on by default for O2/N2 to airmix in atmos.
Merge pull request #1690 from Metacide/master

Updated MetaStation.v37G.II.dmm to MetaStation.v37H.dmm
Removed potential runtime from spawning projectile/shotgun. Also made it so shotguns actually load shotgun shells.
Blobs will slowly regenerate health when pulsed. They have a second cooldown after every pulse to make sure 5 nodes aren't healing them too quickly.

Changed how the overmind hud was updated so that it was more accurate. Instead of updating every life() it will update everytime the blob core health changes and everytime the resource count changes.

Renamed the expand power to "expand/attack", to make it more clear to new blubbers that you use it to attack people.