Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28

2019-08-24 19:05:51 +02:00
parent 1e1f8e627f 62e931c62d
commit 24fe7126c4
763 changed files with 18834 additions and 6252 deletions
@@ -27,7 +27,7 @@

 	var/obj/item/radio/radio
 	var/radio_key = /obj/item/encryptionkey/headset_med
-	var/radio_channel = "Medical"
+	var/radio_channel = RADIO_CHANNEL_MEDICAL

 	var/running_anim = FALSE