Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync

This commit is contained in:
Arokha Sieyes
2017-03-11 18:47:17 -05:00
26 changed files with 642 additions and 365 deletions
@@ -35,12 +35,12 @@
/obj/item/device/radio/intercom/department/medbay
name = "station intercom (Medbay)"
icon_state = "secintercom"
icon_state = "medintercom"
frequency = MED_I_FREQ
/obj/item/device/radio/intercom/department/security
name = "station intercom (Security)"
icon_state = "medintercom"
icon_state = "secintercom"
frequency = SEC_I_FREQ
/obj/item/device/radio/intercom/entertainment