Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Changed moneyplants to use the plant's potency instead of a random value when generating spacecash.
Merge branch 'master' of https://github.com/Ikarrus/-tg-station
[MAP] Fixed batons in the thunderdome not having a cell.
Merge pull request #528 from Rolan7/HydroponicsTweaks

Changed moneyplants to use the plant's potency...
Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
Merge pull request #590 from Ikarrus/thunderbaton

[MAP] Fixed batons in the thunderdome not having a cell
Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
-Rewrote unequipping modules for cleaner code
-Cyborg rods now properly regenerate in while charging
-cyborg rods can no longer be used to generate metal
-Removed roman numerals from the icon