Adds a training bomb to the armory
Gives a little love to the wizard's den showcases
Merge branch 'master' of https://github.com/tgstation/-tg-station into bombplacement

Conflicts:
	maps/tgstation.2.1.2.dmm

Gia lied, people died
(sic)
(sicsic)

THIS IS A GOOD USE OF COMMITS I TELL YOU HWUT
Merge pull request #2325 from Incoming5643/bombplacement

[MAP] Adds a training bomb to armory