Merge pull request #8912 from Ghommie/Ghommie-cit146

Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
parent a579e1f7bd 927baaa333
commit f1c9a07f6d
37 changed files with 291 additions and 190 deletions
@@ -67,7 +67,7 @@ Head of Personnel
 	flag = HOP
 	department_head = list("Captain")
 	department_flag = CIVILIAN
-	head_announce = list("Supply", "Service")
+	head_announce = list(RADIO_CHANNEL_SERVICE)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -6,6 +6,7 @@ Quartermaster
 	flag = QUARTERMASTER
 	department_head = list("Head of Personnel")
 	department_flag = CIVILIAN
+	head_announce = list(RADIO_CHANNEL_SUPPLY)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -6,7 +6,7 @@ Chief Engineer
 	flag = CHIEF
 	department_head = list("Captain")
 	department_flag = ENGSEC
-	head_announce = list("Engineering")
+	head_announce = list(RADIO_CHANNEL_ENGINEERING)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -6,7 +6,7 @@ Chief Medical Officer
 	flag = CMO_JF
 	department_head = list("Captain")
 	department_flag = MEDSCI
-	head_announce = list("Medical")
+	head_announce = list(RADIO_CHANNEL_MEDICAL)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -6,7 +6,7 @@ Research Director
 	flag = RD_JF
 	department_head = list("Captain")
 	department_flag = MEDSCI
-	head_announce = list("Science")
+	head_announce = list(RADIO_CHANNEL_SCIENCE)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -12,7 +12,7 @@ Head of Security
 	flag = HOS
 	department_head = list("Captain")
 	department_flag = ENGSEC
-	head_announce = list("Security")
+	head_announce = list(RADIO_CHANNEL_SECURITY)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1