Merge pull request #1 from tgstation/master

Updating my fork
Syringe log

Adds syringes to attack logs. No immediate notices because OH MY GOD
SPAM, but more useful than a subverted AI for investigating medical
grief.
Adds the RD's reactive armor to possible steal objectives.
Reactive armor now spawns in the RD's locker.
Replaced some tables with racks in the RD's office.
Slimmed down the default backpack to make assistants look slightly less like a hunchback
Merge branch 'master' of https://github.com/tgstation/-tg-station into hunchback
changelog.html
and here's the left side!
More grind-able sheets

Metal sheets can now to ground down for iron
Glass sheets can be ground down for silicon
Wood sheets can be ground down for carbon
Recyclable floor tiles

Adds the code to weld floor tiles together to make sheets, just like rods except it takes 4 tiles instead of 2 rods.
changelog.html
Added Plasteel (iron + plasma) and Reinforced Glass (iron + silicon)
Added pictures for all the different stamps in the game to show them on paper.
Changed the way stamps are displayed in html (no <HR> between them, only one at start).
Made the QM and law office stamps unique (and changed them in the maps).
Made the default stamp a "granted" stamp.
Added a "granted" stamp and paper_stamp sprite (green checkmark).

Signed-off-by: Kyrah Abattoir <github@kyrahabattoir.com>
Changed the QM stamp in MetaStation.
Fixed a typo with the qm stamp in tgstation.
Fixed the captain stamp looking more like approvel than approval, damn pixels.
Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles

Conflicts:
	html/changelog.html
Merge branch 'master' of https://github.com/tgstation/-tg-station into irongrinder

Conflicts:
	html/changelog.html
Merge branch 'master' of https://github.com/tgstation/-tg-station into hunchback

Conflicts:
	html/changelog.html
reverted changelog.html correctly this time...
removed changelog.html
Merge pull request #473 from Malkevin/hunchback

Slimline grey backpacks