Baystation12/Baystation12 — pull request #6971 by PsiOmegaDelta (2014-11-08 21:47:47+00:00)
Title: Merges dev into master.

Merge remote-tracking branch 'master' into 'dev'.
Do tell if I shouldn't be doing this, there are fixes on master I need to continue with the powernet task.

@atlantiscze, sorry to say I lost your power.dmi changes. Was unable to sort out what you had done with it. If you could just name the icon states I can do the rest.
Also had trouble merging your power.dm fixes, the differences were just too great.

Conflicts:
code/game/objects/items/devices/PDA/PDA.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/power/cable.dm
code/modules/power/power.dm
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
icons/obj/power.dmi