diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index dc7cbe6a24d..fb167c04065 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -103,6 +103,7 @@ var/const/PUBLIC_HIGH_FREQ = 1489 var/const/RADIO_HIGH_FREQ = 1600 var/const/SYND_FREQ = 1213 +var/const/SYNDTEAM_FREQ = 1244 var/const/DTH_FREQ = 1341 var/const/AI_FREQ = 1343 var/const/ERT_FREQ = 1345 @@ -132,6 +133,7 @@ var/list/radiochannels = list( "Response Team" = ERT_FREQ, "Special Ops" = DTH_FREQ, "Syndicate" = SYND_FREQ, + "SyndTeam" = SYNDTEAM_FREQ, "Supply" = SUP_FREQ, "Service" = SRV_FREQ, "AI Private" = AI_FREQ, @@ -142,8 +144,11 @@ var/list/radiochannels = list( // central command channels, i.e deathsquid & response teams var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ) +// Channels that show up as '#unkn' +var/list/UNKN_FREQS = list(SYND_FREQ) + // Antag channels, i.e. Syndicate -var/list/ANTAG_FREQS = list(SYND_FREQ) +var/list/ANTAG_FREQS = list(SYND_FREQ, SYNDTEAM_FREQ) //Department channels, arranged lexically var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ) diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm index b78345b0638..89e5c4d0a71 100644 --- a/code/defines/procs/radio.dm +++ b/code/defines/procs/radio.dm @@ -7,7 +7,7 @@ var/freq_text // the name of the channel - if(display_freq in ANTAG_FREQS) + if(display_freq in UNKN_FREQS) freq_text = "#unkn" else for(var/channel in radiochannels) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 34be5ed1c67..44a3181b8b9 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -373,6 +373,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept blackbox.msg_deathsquad += blackbox_msg if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg + if(SYNDTEAM_FREQ) + blackbox.msg_syndteam += blackbox_msg if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg if(SRV_FREQ) @@ -558,6 +560,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept blackbox.msg_deathsquad += blackbox_msg if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg + if(SYNDTEAM_FREQ) + blackbox.msg_syndteam += blackbox_msg if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg if(SRV_FREQ) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index d6e1034ee74..7350f3965cc 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -21,6 +21,12 @@ origin_tech = "syndicate=3" syndie = 1 //Signifies that it de-crypts Syndicate transmissions +/obj/item/device/encryptionkey/syndteam + icon_state = "cypherkey" + channels = list("SyndTeam" = 1, "Syndicate" = 1) + origin_tech = "syndicate=4" + syndie = 1 //Signifies that it de-crypts Syndicate transmissions + /obj/item/device/encryptionkey/binary name = "binary translator key" desc = "An encryption key for a radio headset. To access the binary channel, use :b." diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 214e87d1f87..ecb1c38d9d7 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -96,6 +96,12 @@ icon_state = "syndie_headset" item_state = "syndie_headset" +/obj/item/device/radio/headset/syndicate/syndteam + ks1type = /obj/item/device/encryptionkey/syndteam + +/obj/item/device/radio/headset/syndicate/alt/syndteam + ks1type = /obj/item/device/encryptionkey/syndteam + /obj/item/device/radio/headset/binary origin_tech = "syndicate=3" ks1type = /obj/item/device/encryptionkey/binary diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm index 3babf7d44e3..e49a2f72939 100644 --- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm +++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm @@ -188,8 +188,8 @@ var/global/sent_syndicate_infiltration_team = 0 D.implant(src) // Radio & PDA - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src) - R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. + var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/syndteam(src) + R.set_frequency(SYNDTEAM_FREQ) equip_to_slot_or_del(R, slot_l_ear) equip_or_collect(new /obj/item/device/pda(src), slot_in_backpack) diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index 5460d90dd6a..33512a3fe10 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -82,14 +82,6 @@ var/global/sent_syndicate_strike_team = 0 new_syndicate_commando.faction += "syndicate" syndicate_commando_number-- -//Spawns the rest of the commando gear. -// for(var/obj/effect/landmark/L) - // if(L.name == "Commando_Manual") - //new /obj/item/weapon/gun/energy/pulse_rifle(L.loc) - // var/obj/item/weapon/paper/P = new(L.loc) - // P.info = "

Good morning soldier!. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:
#1 Work as a team.
#2 Accomplish your objective at all costs.
#3 Leave no witnesses.
You are fully equipped and stocked for your mission--before departing on the Spec. Ops. Shuttle due South, make sure that all operatives are ready. Actual mission objective will be relayed to you by Central Command through your headsets.
If deemed appropriate, Central Command will also allow members of your team to equip assault power-armor for the mission. You will find the armor storage due West of your position. Once you are ready to leave, utilize the Special Operations shuttle console and toggle the hull doors via the other console.

In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations LEADER is provided with a nuclear authentication disk and a pin-pointer for this reason. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.

Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.
First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.
To make the device functional:
#1 Place bomb in designated detonation zone
#2 Extend and anchor bomb (attack with hand).
#3 Insert Nuclear Auth. Disk into slot.
#4 Type numeric code into keypad ([nuke_code]).
Note: If you make a mistake press R to reset the device.
#5 Press the E button to log onto the device.
You now have activated the device. To deactivate the buttons at anytime, for example when you have already prepped the bomb for detonation, remove the authentication disk OR press the R on the keypad. Now the bomb CAN ONLY be detonated using the timer. A manual detonation is not an option.
Note: Toggle off the SAFETY.
Use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
Note: THE BOMB IS STILL SET AND WILL DETONATE
Now before you remove the disk if you need to move the bomb you can: Toggle off the anchor, move it, and re-anchor.

The nuclear authorization code is: [nuke_code ? nuke_code : "None provided"]

Good luck, soldier!

" - // P.name = "Spec. Ops. Manual" - for(var/obj/effect/landmark/L in landmarks_list) if(L.name == "Syndicate-Commando-Bomb") new /obj/effect/spawner/newbomb/timer/syndicate(L.loc) @@ -126,8 +118,8 @@ var/global/sent_syndicate_strike_team = 0 /mob/living/carbon/human/proc/equip_syndicate_commando(syndicate_leader_selected = 0) - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(src) - R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. + var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt/syndteam(src) + R.set_frequency(SYNDTEAM_FREQ) equip_to_slot_or_del(R, slot_l_ear) equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform) equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index dbcefec7365..e534d67ee72 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -29,7 +29,8 @@ var/list/department_radio_keys = list( ":U" = "Supply", "#U" = "Supply", ".U" = "Supply", ":Z" = "Service", "#Z" = "Service", ".Z" = "Service", ":P" = "AI Private", "#P" = "AI Private", ".P" = "AI Private", - ":-" = "Special Ops", "#-" = "Special Ops", ".-" = "Special Ops" + ":-" = "Special Ops", "#-" = "Special Ops", ".-" = "Special Ops", + ":_" = "SyndTeam", "#_" = "SyndTeam", "._" = "SyndTeam" ) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 815f6d1fe58..f2a5c4142d8 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -209,6 +209,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_syndteam = list() var/list/msg_mining = list() var/list/msg_cargo = list() var/list/msg_service = list() @@ -235,6 +236,7 @@ var/obj/machinery/blackbox_recorder/blackbox BR.msg_security = msg_security BR.msg_deathsquad = msg_deathsquad BR.msg_syndicate = msg_syndicate + BR.msg_syndteam = msg_syndteam BR.msg_mining = msg_mining BR.msg_cargo = msg_cargo BR.msg_service = msg_service @@ -277,6 +279,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","SYT-[msg_syndteam.len]") feedback_add_details("radio_usage","MIN-[msg_mining.len]") feedback_add_details("radio_usage","CAR-[msg_cargo.len]") feedback_add_details("radio_usage","SRV-[msg_service.len]")