Merge pull request #8912 from Ghommie/Ghommie-cit146

Ports "Headset Channel Descriptions Are No Longer Hardcoded"
This commit is contained in:
kevinz000
2019-08-04 22:41:49 -07:00
committed by GitHub
37 changed files with 291 additions and 190 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
var/siphoning = FALSE
var/next_warning = 0
var/obj/item/radio/radio
var/radio_channel = "Common"
var/radio_channel = RADIO_CHANNEL_COMMON
var/minimum_time_between_warnings = 400
/obj/machinery/computer/bank_machine/Initialize()
+1 -1
View File
@@ -31,7 +31,7 @@
var/internal_radio = TRUE
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_med
var/radio_channel = "Medical"
var/radio_channel = RADIO_CHANNEL_MEDICAL
var/obj/effect/countdown/clonepod/countdown