Phase 2 of my master plan:

-Adds a Service headset channel, given to the botanists, barman, and chef. The HoP also gets the service channel on his headset. Note: The Service Preset Server will have to be added to Telecomms on the map before the channel is usable. I'll put up the map when/if this gets merged.
Tsuchigumo550 · May 13, 2013 · 0c47147 · 0c47147
1 parent 8ce6ed4
commit 0c47147
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 27 deletions.
diff --git a/code/game/communications.dm b/code/game/communications.dm
@@ -107,9 +107,10 @@ var/list/radiochannels = list(
 	"Deathsquad" = 1441,
 	"Syndicate" = 1213,
 	"Supply" = 1347,
+	"Service" = 1349,
 )
 //depenging helpers
-var/list/DEPT_FREQS = list(1351,1355,1357,1213,1441,1347)
+var/list/DEPT_FREQS = list(1351,1355,1357,1213,1441,1347,1349)
 var/const/SEC_FREQ = 1359 //security, colored cyan in chat window
 var/const/COMM_FREQ = 1353 //command, colored gold in chat window
 var/const/SYND_FREQ = 1213

diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
@@ -16,6 +16,7 @@
 		if(!H)	return 0
 		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
 		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_ears)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
@@ -54,6 +55,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_ears)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
@@ -78,6 +80,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_ears)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)

diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
@@ -348,8 +348,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 				freq_text = "Engineering"
 			if(SEC_FREQ)
 				freq_text = "Security"
-//			if(1349)
-//				freq_text = "Mining"
+			if(1349)
+				freq_text = "Service"
 			if(1347)
 				freq_text = "Supply"
 		//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
@@ -411,8 +411,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_deathsquad += blackbox_msg
 				if(1213)
 					blackbox.msg_syndicate += blackbox_msg
-//				if(1349)
-//					blackbox.msg_mining += blackbox_msg
+				if(1349)
+					blackbox.msg_service += blackbox_msg
 				if(1347)
 					blackbox.msg_cargo += blackbox_msg
 				else
@@ -634,8 +634,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 				freq_text = "Engineering"
 			if(SEC_FREQ)
 				freq_text = "Security"
-//			if(1349)
-//				freq_text = "Mining"
+			if(1349)
+				freq_text = "Service"
 			if(1347)
 				freq_text = "Supply"
 		//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
@@ -692,8 +692,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_deathsquad += blackbox_msg
 				if(1213)
 					blackbox.msg_syndicate += blackbox_msg
-//				if(1349)
-//					blackbox.msg_mining += blackbox_msg
+				if(1349)
+					blackbox.msg_service += blackbox_msg
 				if(1347)
 					blackbox.msg_cargo += blackbox_msg
 				else

diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
@@ -30,7 +30,7 @@
 	id = "Hub"
 	network = "tcommsat"
 	autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical",
-	"supply", "common", "command", "engineering", "security",
+	"supply", "service", "common", "command", "engineering", "security",
 	"receiverA", "receiverB", "broadcasterA", "broadcasterB")
 
 //Receivers
@@ -41,7 +41,7 @@
 	id = "Receiver A"
 	network = "tcommsat"
 	autolinkers = list("receiverA") // link to relay
-	freq_listening = list(1351, 1355, 1347) // science, medical, supply
+	freq_listening = list(1351, 1355, 1347, 1349) // science, medical, supply, service
 
 
 //--PRESET RIGHT--//
@@ -70,8 +70,8 @@
 /obj/machinery/telecomms/bus/preset_two
 	id = "Bus 2"
 	network = "tcommsat"
-	freq_listening = list(1347)
-	autolinkers = list("processor2", "supply")
+	freq_listening = list(1347,1349)
+	autolinkers = list("processor2", "supply", "service")
 
 /obj/machinery/telecomms/bus/preset_three
 	id = "Bus 3"
@@ -132,12 +132,12 @@
 	id = "Supply Server"
 	freq_listening = list(1347)
 	autolinkers = list("supply")
-/*
-/obj/machinery/telecomms/server/presets/mining
-	id = "Mining Server"
+
+/obj/machinery/telecomms/server/presets/service
+	id = "Service Server"
 	freq_listening = list(1349)
-	autolinkers = list("mining")
-*/
+	autolinkers = list("service")
+
 /obj/machinery/telecomms/server/presets/common
 	id = "Common Server"
 	freq_listening = list()

diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -72,7 +72,7 @@
 	name = "Captain's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cap_cypherkey"
-	channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0)
+	channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)
 
 /obj/item/device/encryptionkey/heads/rd
 	name = "Research Director's Encryption Key"
@@ -102,7 +102,7 @@
 	name = "Head of Personnel's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "hop_cypherkey"
-	channels = list("Supply" = 1, "Command" = 1, "Security" = 0)
+	channels = list("Supply" = 1, "Command" = 1, "Service" = 1, "Security" = 0)
 /*
 /obj/item/device/encryptionkey/headset_mine
 	name = "Mining Radio Encryption Key"
@@ -120,4 +120,10 @@
 	name = "Supply Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cargo_cypherkey"
-	channels = list("Supply" = 1)
+	channels = list("Supply" = 1)
+
+/obj/item/device/encryptionkey/headset_service
+	name = "Service Radio Encryption Key"
+	desc = "An encyption key for a radio headset.  Contains cypherkeys."
+	icon_state = "srv_cypherkey"
+	channels = list("Service" = 1)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
@@ -156,6 +156,13 @@
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
 
+/obj/item/device/radio/headset/headset_service
+	name = "service radio headset"
+	desc = "Headset used by the foodservice and entertainment staff. To access the service channel, use :q."
+	icon_state = "srv_headset"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/headset_service
+
 /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
 //	..()
 	user.set_machine(src)

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
@@ -473,8 +473,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 					freq_text = "Engineering"
 				if(SEC_FREQ)
 					freq_text = "Security"
-//				if(1349)
-//					freq_text = "Mining"
+				if(1349)
+					freq_text = "Service"
 				if(1347)
 					freq_text = "Supply"
 			//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
@@ -521,7 +521,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 					if(1213)
 						blackbox.msg_syndicate += blackbox_msg
 					if(1349)
-						blackbox.msg_mining += blackbox_msg
+						blackbox.msg_service += blackbox_msg
 					if(1347)
 						blackbox.msg_cargo += blackbox_msg
 					else

diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
@@ -14,6 +14,7 @@ var/list/department_radio_keys = list(
 	  ":a" = "alientalk",	"#a" = "alientalk",		".a" = "alientalk",
 	  ":t" = "Syndicate",	"#t" = "Syndicate",		".t" = "Syndicate",
 	  ":u" = "Supply",		"#u" = "Supply",		".u" = "Supply",
+	  ":q" = "Service",		"#q" = "Service",		".q" = "Service",
 	  ":g" = "changeling",	"#g" = "changeling",	".g" = "changeling",
 
 	  ":R" = "right hand",	"#R" = "right hand",	".R" = "right hand",
@@ -30,6 +31,7 @@ var/list/department_radio_keys = list(
 	  ":A" = "alientalk",	"#A" = "alientalk",		".A" = "alientalk",
 	  ":T" = "Syndicate",	"#T" = "Syndicate",		".T" = "Syndicate",
 	  ":U" = "Supply",		"#U" = "Supply",		".U" = "Supply",
+	  ":Q" = "Service",		"#Q" = "Service",		".Q" = "Service",
 	  ":G" = "changeling",	"#G" = "changeling",	".G" = "changeling",
 
 	  //kinda localization -- rastaf0

diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
@@ -191,7 +191,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	var/list/msg_security = list()
 	var/list/msg_deathsquad = list()
 	var/list/msg_syndicate = list()
-	var/list/msg_mining = list()
+	var/list/msg_service = list()
 	var/list/msg_cargo = list()
 
 	var/list/datum/feedback_variable/feedback = new()
@@ -216,7 +216,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 		BR.msg_security = msg_security
 		BR.msg_deathsquad = msg_deathsquad
 		BR.msg_syndicate = msg_syndicate
-		BR.msg_mining = msg_mining
+		BR.msg_service = msg_service
 		BR.msg_cargo = msg_cargo
 		BR.feedback = feedback
 		BR.messages = messages
@@ -257,7 +257,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	feedback_add_details("radio_usage","SEC-[msg_security.len]")
 	feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]")
 	feedback_add_details("radio_usage","SYN-[msg_syndicate.len]")
-	feedback_add_details("radio_usage","MIN-[msg_mining.len]")
+	feedback_add_details("radio_usage","SRV-[msg_service.len]")
 	feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
 	feedback_add_details("radio_usage","OTH-[messages.len]")
 	feedback_add_details("radio_usage","PDA-[pda_msg_amt]")

diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
@@ -84,6 +84,7 @@
 		interpreter.SetVar("$engineering",1357)
 		interpreter.SetVar("$security",	1359)
 		interpreter.SetVar("$supply",	1347)
+		interpreter.SetVar("$service",	1349)
 
 		// Signal data