Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

This commit is contained in:
PsiOmegaDelta
2015-12-07 17:56:27 +01:00
36 changed files with 440 additions and 425 deletions
@@ -112,6 +112,9 @@
else
icon_state = "intercom"
/obj/item/device/radio/intercom/broadcasting
broadcasting = 1
/obj/item/device/radio/intercom/locked
var/locked_frequency