diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 0ed0fe3d404..4d2612c7177 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -1,5 +1,7 @@ // Station ranks #define RANK_HEADS "Heads" +#define RANK_SECURITY "Security" +#define RANK_ENGINEERING "Engineering" // Main Station Jobs diff --git a/code/__defines/radio.dm b/code/__defines/radio.dm new file mode 100644 index 00000000000..34934bedae4 --- /dev/null +++ b/code/__defines/radio.dm @@ -0,0 +1,28 @@ +// Station Radio Channel +#define CHANNEL_COMMON "Common" +#define CHANNEL_AI_PRIVATE "AI Private" +#define CHANNEL_ENTERTAINMENT "Entertainment" + +// Departments +#define CHANNEL_COMMAND "Command" +#define CHANNEL_SECURITY "Security" +#define CHANNEL_SECURITY_1 "Security(I)" +#define CHANNEL_SUPPLY "Supply" +#define CHANNEL_SERVICE "Service" +#define CHANNEL_ENGINEERING "Engineering" +#define CHANNEL_SCIENCE "Science" +#define CHANNEL_MEDICAL "Medical" +#define CHANNEL_MEDICAL_1 "Medical(I)" +#define CHANNEL_EXPLORATION "Away Team" + +// Special Channels +#define CHANNEL_RESPONSE_TEAM "Response Team" +#define CHANNEL_SPECIAL_OPS "Special Ops" + +// Antag Channels +#define CHANNEL_RAIDER "Raider" +#define CHANNEL_MERCENARY "Mercenary" + +// Other Channels +#define CHANNEL_TALON "Talon" +#define CHANNEL_CASINO "Casino" diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index bbdccb8fc0e..e8d76099c74 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -129,25 +129,25 @@ var/const/TALON_FREQ = 1363 //VOREStation Add var/const/CSN_FREQ = 1365 //VOREStation Add var/list/radiochannels = list( - "Common" = PUB_FREQ, - "Science" = SCI_FREQ, - "Command" = COMM_FREQ, - "Medical" = MED_FREQ, - "Engineering" = ENG_FREQ, - "Security" = SEC_FREQ, - "Response Team" = ERT_FREQ, - "Special Ops" = DTH_FREQ, - "Mercenary" = SYND_FREQ, - "Raider" = RAID_FREQ, - "Supply" = SUP_FREQ, - "Service" = SRV_FREQ, - "Away Team" = EXP_FREQ, - "AI Private" = AI_FREQ, - "Entertainment" = ENT_FREQ, - "Medical(I)" = MED_I_FREQ, - "Security(I)" = SEC_I_FREQ, - "Talon" = TALON_FREQ, //VOREStation Add - "Casino" = CSN_FREQ, + CHANNEL_COMMON = PUB_FREQ, + CHANNEL_SCIENCE = SCI_FREQ, + CHANNEL_COMMAND = COMM_FREQ, + CHANNEL_MEDICAL = MED_FREQ, + CHANNEL_ENGINEERING = ENG_FREQ, + CHANNEL_SECURITY = SEC_FREQ, + CHANNEL_RESPONSE_TEAM = ERT_FREQ, + CHANNEL_SPECIAL_OPS = DTH_FREQ, + CHANNEL_MERCENARY = SYND_FREQ, + CHANNEL_RAIDER = RAID_FREQ, + CHANNEL_SUPPLY = SUP_FREQ, + CHANNEL_SERVICE = SRV_FREQ, + CHANNEL_EXPLORATION = EXP_FREQ, + CHANNEL_AI_PRIVATE = AI_FREQ, + CHANNEL_ENTERTAINMENT = ENT_FREQ, + CHANNEL_MEDICAL_1 = MED_I_FREQ, + CHANNEL_SECURITY_1 = SEC_I_FREQ, + CHANNEL_TALON = TALON_FREQ, //VOREStation Add + CHANNEL_CASINO = CSN_FREQ, ) // Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels diff --git a/code/game/jobs/job/department.dm b/code/game/jobs/job/department.dm index 313b19e07b0..47d6de97ad1 100644 --- a/code/game/jobs/job/department.dm +++ b/code/game/jobs/job/department.dm @@ -77,4 +77,4 @@ short_name = "Centcom" color = "#A52A2A" sorting_order = 20 // Above Command. - centcom_only = TRUE \ No newline at end of file + centcom_only = TRUE diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index ac510ee19f0..259d8fa1e6e 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -25,12 +25,12 @@ var/specops_shuttle_timeleft = 0 /proc/specops_return() var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - announcer.config(list("Response Team" = 0)) + announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN\""//Initial message shown. if(announcer) - announcer.autosay(message, "A.L.I.C.E.", "Response Team") + announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM) while(specops_shuttle_time - world.timeofday > 0) var/ticksleft = specops_shuttle_time - world.timeofday @@ -46,7 +46,7 @@ var/specops_shuttle_timeleft = 0 message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" if(rounded_time_left==0) message = "\"ALERT: TAKEOFF\"" - announcer.autosay(message, "A.L.I.C.E.", "Response Team") + announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM) message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle. //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that. @@ -100,14 +100,14 @@ var/specops_shuttle_timeleft = 0 /proc/specops_process() var/area/centcom/specops/special_ops = locate()//Where is the specops area located? var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - announcer.config(list("Response Team" = 0)) + announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH\""//Initial message shown. if(announcer) - announcer.autosay(message, "A.L.I.C.E.", "Response Team") + announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM) // message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" -// announcer.autosay(message, "A.L.I.C.E.", "Response Team") +// announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM) while(specops_shuttle_time - world.timeofday > 0) var/ticksleft = specops_shuttle_time - world.timeofday @@ -123,7 +123,7 @@ var/specops_shuttle_timeleft = 0 message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" if(rounded_time_left==0) message = "\"ALERT: TAKEOFF\"" - announcer.autosay(message, "A.L.I.C.E.", "Response Team") + announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM) message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle. //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that. diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index d9292282bff..2dda16f7b5f 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -1,18 +1,18 @@ var/global/list/radio_channels_by_freq = list( - num2text(PUB_FREQ) = "Common", - num2text(AI_FREQ) = "AI Private", - num2text(ENT_FREQ) = "Entertainment", - num2text(ERT_FREQ) = "Response Team", - num2text(COMM_FREQ)= "Command", - num2text(ENG_FREQ) = "Engineering", - num2text(MED_FREQ) = "Medical", - num2text(MED_I_FREQ)="Medical(I)", - num2text(SEC_FREQ) = "Security", - num2text(SEC_I_FREQ)="Security(I)", - num2text(SCI_FREQ) = "Science", - num2text(SUP_FREQ) = "Supply", - num2text(SRV_FREQ) = "Service", - num2text(EXP_FREQ) = "Away Team" + num2text(PUB_FREQ) = CHANNEL_COMMON, + num2text(AI_FREQ) = CHANNEL_AI_PRIVATE, + num2text(ENT_FREQ) = CHANNEL_ENTERTAINMENT, + num2text(ERT_FREQ) = CHANNEL_RESPONSE_TEAM, + num2text(COMM_FREQ)= CHANNEL_COMMAND, + num2text(ENG_FREQ) = CHANNEL_ENGINEERING, + num2text(MED_FREQ) = CHANNEL_MEDICAL, + num2text(MED_I_FREQ)=CHANNEL_MEDICAL_1, + num2text(SEC_FREQ) = CHANNEL_SECURITY, + num2text(SEC_I_FREQ)=CHANNEL_SECURITY_1, + num2text(SCI_FREQ) = CHANNEL_SCIENCE, + num2text(SUP_FREQ) = CHANNEL_SUPPLY, + num2text(SRV_FREQ) = CHANNEL_SERVICE, + num2text(EXP_FREQ) = CHANNEL_EXPLORATION ) GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index f28c98ef41e..0502cd25d3b 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -15,13 +15,13 @@ /obj/item/device/encryptionkey/syndicate icon_state = "syn_cypherkey" - channels = list("Mercenary" = 1) + channels = list(CHANNEL_MERCENARY = 1) origin_tech = list(TECH_ILLEGAL = 3) syndie = 1//Signifies that it de-crypts Syndicate transmissions /obj/item/device/encryptionkey/raider icon_state = "cypherkey" - channels = list("Raider" = 1) + channels = list(CHANNEL_RAIDER = 1) origin_tech = list(TECH_ILLEGAL = 2) syndie = 1 @@ -33,73 +33,73 @@ /obj/item/device/encryptionkey/headset_sec name = "security radio encryption key" icon_state = "sec_cypherkey" - channels = list("Security" = 1) + channels = list(CHANNEL_SECURITY = 1) /obj/item/device/encryptionkey/headset_eng name = "engineering radio encryption key" icon_state = "eng_cypherkey" - channels = list("Engineering" = 1) + channels = list(CHANNEL_ENGINEERING = 1) /obj/item/device/encryptionkey/headset_rob name = "robotics radio encryption key" icon_state = "rob_cypherkey" - channels = list("Engineering" = 1, "Science" = 1) + channels = list(CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1) /obj/item/device/encryptionkey/headset_med name = "medical radio encryption key" icon_state = "med_cypherkey" - channels = list("Medical" = 1) + channels = list(CHANNEL_MEDICAL = 1) /obj/item/device/encryptionkey/headset_sci name = "science radio encryption key" icon_state = "sci_cypherkey" - channels = list("Science" = 1) + channels = list(CHANNEL_SCIENCE = 1) /obj/item/device/encryptionkey/headset_medsci name = "medical research radio encryption key" icon_state = "medsci_cypherkey" - channels = list("Medical" = 1, "Science" = 1) + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_SCIENCE = 1) /obj/item/device/encryptionkey/headset_com name = "command radio encryption key" icon_state = "com_cypherkey" - channels = list("Command" = 1) + channels = list(CHANNEL_COMMAND = 1) /obj/item/device/encryptionkey/heads/captain name = "site manager's encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1) /obj/item/device/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1) /obj/item/device/encryptionkey/heads/rd name = "research director's encryption key" icon_state = "rd_cypherkey" - channels = list("Science" = 1, "Command" = 1) + channels = list(CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1) /obj/item/device/encryptionkey/heads/hos name = "head of security's encryption key" icon_state = "hos_cypherkey" - channels = list("Security" = 1, "Command" = 1) + channels = list(CHANNEL_SECURITY = 1, CHANNEL_COMMAND = 1) /obj/item/device/encryptionkey/heads/ce name = "chief engineer's encryption key" icon_state = "ce_cypherkey" - channels = list("Engineering" = 1, "Command" = 1) + channels = list(CHANNEL_ENGINEERING = 1, CHANNEL_COMMAND = 1) /obj/item/device/encryptionkey/heads/cmo name = "chief medical officer's encryption key" icon_state = "cmo_cypherkey" - channels = list("Medical" = 1, "Command" = 1) + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_COMMAND = 1) /obj/item/device/encryptionkey/heads/hop name = "head of personnel's encryption key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1) /* /obj/item/device/encryptionkey/headset_mine name = "mining radio encryption key" @@ -114,22 +114,22 @@ /obj/item/device/encryptionkey/headset_cargo name = "supply radio encryption key" icon_state = "cargo_cypherkey" - channels = list("Supply" = 1) + channels = list(CHANNEL_SUPPLY = 1) /obj/item/device/encryptionkey/headset_service name = "service radio encryption key" icon_state = "srv_cypherkey" - channels = list("Service" = 1) + channels = list(CHANNEL_SERVICE = 1) /obj/item/device/encryptionkey/ert name = "\improper ERT radio encryption key" icon_state = "cent_cypherkey" - channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1) + channels = list(CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1) /obj/item/device/encryptionkey/omni //Literally only for the admin intercoms - channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1) + channels = list(CHANNEL_MERCENARY = 1, CHANNEL_RAIDER = 1, CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1) syndie = 1//Signifies that it de-crypts Syndicate transmissions /obj/item/device/encryptionkey/ent name = "entertainment encryption key" - channels = list("Entertainment" = 1) + channels = list(CHANNEL_ENTERTAINMENT = 1) diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm index 5294ae139e0..1396bc898d2 100644 --- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm +++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm @@ -1,54 +1,54 @@ /obj/item/device/encryptionkey/heads/hop name = "head of personnel's encryption key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Away Team" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Away Team" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/heads/captain name = "site manager's encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/heads/rd name = "research director's encryption key" icon_state = "rd_cypherkey" - channels = list("Command" = 1, "Science" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SCIENCE = 1) /obj/item/device/encryptionkey/ert - channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1) + channels = list(CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/omni //Literally only for the admin intercoms - channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1) + channels = list(CHANNEL_MERCENARY = 1, CHANNEL_RAIDER = 1, CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/pathfinder name = "pathfinder's encryption key" icon_state = "com_cypherkey" - channels = list("Command" = 1, "Away Team" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/qm name = "quartermaster's encryption key" icon_state = "qm_cypherkey" - channels = list("Command" = 1, "Supply" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SUPPLY = 1) /obj/item/device/encryptionkey/pilot name = "pilot's encryption key" icon_state = "cypherkey" - channels = list("Away Team" = 1) + channels = list(CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/explorer name = "away team's encryption key" icon_state = "rob_cypherkey" - channels = list("Away Team" = 1) + channels = list(CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/sar name = "fm's encryption key" icon_state = "med_cypherkey" - channels = list("Medical" = 1, "Away Team" = 1) + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/talon - channels = list("Talon" = 1) + channels = list(CHANNEL_TALON = 1) diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index d4a238f9d10..2677aaad8fa 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -61,7 +61,7 @@ var/savefile/Banlistjob if (temp) UpdateTime() bantimestamp = CMinutes + minutes - if(rank == "Heads") + if(rank == RANK_HEADS) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_PERSONNEL) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SITE_MANAGER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) @@ -69,14 +69,14 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") return 1 - if(rank == "Security") + if(rank == RANK_SECURITY) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_WARDEN) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_DETECTIVE) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SECURITY_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 - if(rank == "Engineering") + if(rank == RANK_ENGINEERING) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Atmospheric Technician") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm index 57944365e33..540cc26d300 100644 --- a/code/modules/admin/verbs/modify_robot.dm +++ b/code/modules/admin/verbs/modify_robot.dm @@ -229,13 +229,13 @@ var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to add", "Channels", available_channels) if(!selected_radio_channel || selected_radio_channel == "Cancel") break - if(selected_radio_channel == "Special Ops") + if(selected_radio_channel == CHANNEL_SPECIAL_OPS) target.radio.centComm = 1 - if(selected_radio_channel == "Raider") + if(selected_radio_channel == CHANNEL_RAIDER) qdel(target.radio.keyslot) target.radio.keyslot = new /obj/item/device/encryptionkey/raider(target) target.radio.syndie = 1 - if(selected_radio_channel == "Mercenary") + if(selected_radio_channel == CHANNEL_MERCENARY) qdel(target.radio.keyslot) target.radio.keyslot = new /obj/item/device/encryptionkey/syndicate(target) target.radio.syndie = 1 @@ -249,10 +249,10 @@ var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to remove", "Channels", target.radio.channels) if(!selected_radio_channel || selected_radio_channel == "Cancel") break - if(selected_radio_channel == "Special Ops") + if(selected_radio_channel == CHANNEL_SPECIAL_OPS) target.radio.centComm = 0 target.module.channels -= selected_radio_channel - if((selected_radio_channel == "Mercenary" || selected_radio_channel == "Raider") && !(target.module.channels["Raider"] || target.module.channels["Mercenary"])) + if((selected_radio_channel == CHANNEL_MERCENARY || selected_radio_channel == CHANNEL_RAIDER) && !(target.module.channels[CHANNEL_RAIDER] || target.module.channels[CHANNEL_MERCENARY])) qdel(target.radio.keyslot) target.radio.keyslot = null target.radio.syndie = 0 diff --git a/code/modules/casino/headset_casino.dm b/code/modules/casino/headset_casino.dm index fa7f09d401e..d136eeea19f 100644 --- a/code/modules/casino/headset_casino.dm +++ b/code/modules/casino/headset_casino.dm @@ -15,6 +15,6 @@ /obj/item/device/encryptionkey/casino icon = 'icons/obj/casino.dmi' icon_state = "cypherkey" - channels = list("Casino" = 1) + channels = list(CHANNEL_CASINO = 1) origin_tech = list(TECH_ILLEGAL = 1) - syndie = 1 \ No newline at end of file + syndie = 1 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 83acf1d11c7..93b56d08715 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -4,41 +4,41 @@ var/list/department_radio_keys = list( ":i" = "intercom", ".i" = "intercom", ":h" = "department", ".h" = "department", ":+" = "special", ".+" = "special", //activate radio-specific special functions - ":c" = "Command", ".c" = "Command", - ":n" = "Science", ".n" = "Science", - ":m" = "Medical", ".m" = "Medical", - ":e" = "Engineering", ".e" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", - ":s" = "Security", ".s" = "Security", + ":c" = CHANNEL_COMMAND, ".c" = CHANNEL_COMMAND, + ":n" = CHANNEL_SCIENCE, ".n" = CHANNEL_SCIENCE, + ":m" = CHANNEL_MEDICAL, ".m" = CHANNEL_MEDICAL, + ":e" = CHANNEL_ENGINEERING, ".e" = CHANNEL_ENGINEERING, + ":k" = CHANNEL_RESPONSE_TEAM, ".k" = CHANNEL_RESPONSE_TEAM, + ":s" = CHANNEL_SECURITY, ".s" = CHANNEL_SECURITY, ":w" = "whisper", ".w" = "whisper", - ":t" = "Mercenary", ".t" = "Mercenary", - ":x" = "Raider", ".x" = "Raider", - ":u" = "Supply", ".u" = "Supply", - ":v" = "Service", ".v" = "Service", - ":p" = "AI Private", ".p" = "AI Private", - ":a" = "Away Team", ".a" = "Away Team", //VOREStation Edit - ":y" = "Talon", ".y" = "Talon", //VOREStation Add, - ":g" = "Casino", ".g" = "Casino", + ":t" = CHANNEL_MERCENARY, ".t" = CHANNEL_MERCENARY, + ":x" = CHANNEL_RAIDER, ".x" = CHANNEL_RAIDER, + ":u" = CHANNEL_SUPPLY, ".u" = CHANNEL_SUPPLY, + ":v" = CHANNEL_SERVICE, ".v" = CHANNEL_SERVICE, + ":p" = CHANNEL_AI_PRIVATE, ".p" = CHANNEL_AI_PRIVATE, + ":a" = CHANNEL_EXPLORATION, ".a" = CHANNEL_EXPLORATION, //VOREStation Edit + ":y" = CHANNEL_TALON, ".y" = CHANNEL_TALON, //VOREStation Add, + ":g" = CHANNEL_CASINO, ".g" = CHANNEL_CASINO, ":R" = "right ear", ".R" = "right ear", ":L" = "left ear", ".L" = "left ear", ":I" = "intercom", ".I" = "intercom", ":H" = "department", ".H" = "department", - ":C" = "Command", ".C" = "Command", - ":N" = "Science", ".N" = "Science", - ":M" = "Medical", ".M" = "Medical", - ":E" = "Engineering", ".E" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", - ":S" = "Security", ".S" = "Security", + ":C" = CHANNEL_COMMAND, ".C" = CHANNEL_COMMAND, + ":N" = CHANNEL_SCIENCE, ".N" = CHANNEL_SCIENCE, + ":M" = CHANNEL_MEDICAL, ".M" = CHANNEL_MEDICAL, + ":E" = CHANNEL_ENGINEERING, ".E" = CHANNEL_ENGINEERING, + ":k" = CHANNEL_RESPONSE_TEAM, ".k" = CHANNEL_RESPONSE_TEAM, + ":S" = CHANNEL_SECURITY, ".S" = CHANNEL_SECURITY, ":W" = "whisper", ".W" = "whisper", - ":T" = "Mercenary", ".T" = "Mercenary", - ":X" = "Raider", ".X" = "Raider", - ":U" = "Supply", ".U" = "Supply", - ":V" = "Service", ".V" = "Service", - ":P" = "AI Private", ".P" = "AI Private", - ":A" = "Away Team", ".A" = "Away Team", - ":Y" = "Talon", ".Y" = "Talon", //VOREStation Add, - ":G" = "Casino", ".G" = "Casino", + ":T" = CHANNEL_MERCENARY, ".T" = CHANNEL_MERCENARY, + ":X" = CHANNEL_RAIDER, ".X" = CHANNEL_RAIDER, + ":U" = CHANNEL_SUPPLY, ".U" = CHANNEL_SUPPLY, + ":V" = CHANNEL_SERVICE, ".V" = CHANNEL_SERVICE, + ":P" = CHANNEL_AI_PRIVATE, ".P" = CHANNEL_AI_PRIVATE, + ":A" = CHANNEL_EXPLORATION, ".A" = CHANNEL_EXPLORATION, + ":Y" = CHANNEL_TALON, ".Y" = CHANNEL_TALON, //VOREStation Add, + ":G" = CHANNEL_CASINO, ".G" = CHANNEL_CASINO, // Cyrillic characters on the same keys on the Russian QWERTY (phonetic) layout ":к" = "right ear", ".к" = "right ear", @@ -46,21 +46,21 @@ var/list/department_radio_keys = list( ":ш" = "intercom", ".ш" = "intercom", ":р" = "department", ".р" = "department", ":+" = "special", ".+" = "special", //activate radio-specific special functions - ":с" = "Command", ".с" = "Command", - ":т" = "Science", ".т" = "Science", - ":ь" = "Medical", ".ь" = "Medical", - ":у" = "Engineering", ".у" = "Engineering", - ":л" = "Response Team", ".л" = "Response Team", - ":ы" = "Security", ".ы" = "Security", + ":с" = CHANNEL_COMMAND, ".с" = CHANNEL_COMMAND, + ":т" = CHANNEL_SCIENCE, ".т" = CHANNEL_SCIENCE, + ":ь" = CHANNEL_MEDICAL, ".ь" = CHANNEL_MEDICAL, + ":у" = CHANNEL_ENGINEERING, ".у" = CHANNEL_ENGINEERING, + ":л" = CHANNEL_RESPONSE_TEAM, ".л" = CHANNEL_RESPONSE_TEAM, + ":ы" = CHANNEL_SECURITY, ".ы" = CHANNEL_SECURITY, ":ц" = "whisper", ".ц" = "whisper", - ":е" = "Mercenary", ".е" = "Mercenary", - ":ч" = "Raider", ".ч" = "Raider", - ":г" = "Supply", ".г" = "Supply", - ":м" = "Service", ".м" = "Service", - ":з" = "AI Private", ".з" = "AI Private", - ":ф" = "Away Team", ".ф" = "Away Team", - ":н" = "Talon", ".н" = "Talon", //VOREStation Add - ":п" = "Casino", ".п" = "Casino", + ":е" = CHANNEL_MERCENARY, ".е" = CHANNEL_MERCENARY, + ":ч" = CHANNEL_RAIDER, ".ч" = CHANNEL_RAIDER, + ":г" = CHANNEL_SUPPLY, ".г" = CHANNEL_SUPPLY, + ":м" = CHANNEL_SERVICE, ".м" = CHANNEL_SERVICE, + ":з" = CHANNEL_AI_PRIVATE, ".з" = CHANNEL_AI_PRIVATE, + ":ф" = CHANNEL_EXPLORATION, ".ф" = CHANNEL_EXPLORATION, + ":н" = CHANNEL_TALON, ".н" = CHANNEL_TALON, //VOREStation Add + ":п" = CHANNEL_CASINO, ".п" = CHANNEL_CASINO, ) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 02554d1f21b..3605dd4b99c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -183,14 +183,14 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/proc/handle_shell(var/mob/living/silicon/robot/R) if(R.braintype == BORG_BRAINTYPE_AI_SHELL) channels = list( - "Medical" = 1, - "Engineering" = 1, - "Security" = 1, - "Service" = 1, - "Supply" = 1, - "Science" = 1, - "Command" = 1, - "Away Team" = 1 + CHANNEL_MEDICAL = 1, + CHANNEL_ENGINEERING = 1, + CHANNEL_SECURITY = 1, + CHANNEL_SERVICE = 1, + CHANNEL_SUPPLY = 1, + CHANNEL_SCIENCE = 1, + CHANNEL_COMMAND = 1, + CHANNEL_EXPLORATION = 1 ) /obj/item/weapon/robot_module/robot/New(var/mob/living/silicon/robot/R) @@ -225,7 +225,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/medical name = "medical robot module" - channels = list("Medical" = 1) + channels = list(CHANNEL_MEDICAL = 1) networks = list(NETWORK_MEDICAL) subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) pto_type = PTO_MEDICAL @@ -361,7 +361,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/engineering name = "engineering robot module" - channels = list("Engineering" = 1) + channels = list(CHANNEL_ENGINEERING = 1) networks = list(NETWORK_ENGINEERING) subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor) pto_type = PTO_ENGINEERING @@ -464,7 +464,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/security name = "security robot module" - channels = list("Security" = 1) + channels = list(CHANNEL_SECURITY = 1) networks = list(NETWORK_SECURITY) subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) supported_upgrades = list(/obj/item/borg/upgrade/restricted/tasercooler, /obj/item/borg/upgrade/restricted/bellycapupgrade) @@ -504,7 +504,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/janitor name = "janitorial robot module" - channels = list("Service" = 1) + channels = list(CHANNEL_SERVICE = 1) pto_type = PTO_CIVILIAN /obj/item/weapon/robot_module/robot/janitor/create_equipment(var/mob/living/silicon/robot/robot) @@ -571,8 +571,8 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/clerical name = "service robot module" channels = list( - "Service" = 1, - "Command" = 1 + CHANNEL_SERVICE = 1, + CHANNEL_COMMAND = 1 ) languages = list( LANGUAGE_SOL_COMMON = 1, @@ -596,7 +596,7 @@ var/global/list/robot_modules = list( pto_type = PTO_CIVILIAN /obj/item/weapon/robot_module/robot/clerical/butler - channels = list("Service" = 1) + channels = list(CHANNEL_SERVICE = 1) /obj/item/weapon/robot_module/robot/clerical/butler name = "service robot module" @@ -664,7 +664,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/miner name = "miner robot module" - channels = list("Supply" = 1) + channels = list(CHANNEL_SUPPLY = 1) networks = list(NETWORK_MINE) supported_upgrades = list(/obj/item/borg/upgrade/restricted/pka, /obj/item/borg/upgrade/restricted/diamonddrill) pto_type = PTO_CARGO @@ -687,7 +687,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/research name = "research module" - channels = list("Science" = 1) + channels = list(CHANNEL_SCIENCE = 1) supported_upgrades = list(/obj/item/borg/upgrade/restricted/advrped) pto_type = PTO_SCIENCE @@ -862,7 +862,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/drone/construction name = "construction drone module" hide_on_manifest = TRUE - channels = list("Engineering" = 1) + channels = list(CHANNEL_ENGINEERING = 1) languages = list() /obj/item/weapon/robot_module/drone/construction/create_equipment(var/mob/living/silicon/robot/robot) @@ -877,7 +877,7 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/drone/mining name = "miner drone module" - channels = list("Supply" = 1) + channels = list(CHANNEL_SUPPLY = 1) networks = list(NETWORK_MINE) /obj/item/weapon/robot_module/drone/mining/create_equipment(var/mob/living/silicon/robot/robot) diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm index 55dbb0e79dc..3e8f6faa6e4 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm @@ -43,8 +43,8 @@ "stripe" = "#52b8b8" ) channels = list( - "Science" = 1, - "Away Team" = 1 + CHANNEL_SCIENCE = 1, + CHANNEL_EXPLORATION = 1 ) /obj/item/weapon/robot_module/robot/platform/explorer/create_equipment(var/mob/living/silicon/robot/robot) @@ -85,7 +85,7 @@ "stripe_vertical" = "#bfbfa1", "stripe" = "#bfbfa1" ) - channels = list("Supply" = 1) + channels = list(CHANNEL_SUPPLY = 1) networks = list(NETWORK_MINE) /obj/item/weapon/robot_module/robot/platform/cargo/create_equipment(var/mob/living/silicon/robot/robot) diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 0dd88a58e8e..5151e9a493e 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -21,11 +21,11 @@ /datum/shuttle/autodock/ferry/specops/New() ..() announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - announcer.config(list("Response Team" = 0)) + announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) /datum/shuttle/autodock/ferry/specops/proc/radio_announce(var/message) if(announcer) - announcer.autosay(message, "A.L.I.C.E.", "Response Team") + announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM) /datum/shuttle/autodock/ferry/specops/launch(var/user) diff --git a/maps/southern_cross/items/encryptionkey_sc.dm b/maps/southern_cross/items/encryptionkey_sc.dm index 3e02f2fc089..d723c83c223 100644 --- a/maps/southern_cross/items/encryptionkey_sc.dm +++ b/maps/southern_cross/items/encryptionkey_sc.dm @@ -1,30 +1,30 @@ /obj/item/device/encryptionkey/pilot name = "pilot's encryption key" icon_state = "com_cypherkey" - channels = list("Supply" = 1, "Explorer" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/explorer name = "explorer radio encryption key" icon_state = "com_cypherkey" - channels = list("Explorer" = 1, "Science" = 1) + channels = list(CHANNEL_EXPLORATION = 1, CHANNEL_SCIENCE = 1) /obj/item/device/encryptionkey/sar name = "sar's encryption key" icon_state = "med_cypherkey" - channels = list("Medical" = 1, "Explorer" = 1) + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/heads/hop name = "head of personnel's encryption key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Explorer" = 1) + channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1) + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1) /obj/item/device/encryptionkey/heads/captain name = "site manager's encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) \ No newline at end of file + channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1) diff --git a/vorestation.dme b/vorestation.dme index 68830c2239f..eb8e7aedae4 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -108,6 +108,7 @@ #include "code\__defines\projectile.dm" #include "code\__defines\projectiles.dm" #include "code\__defines\qdel.dm" +#include "code\__defines\radio.dm" #include "code\__defines\recipe.dm" #include "code\__defines\request_console.dm" #include "code\__defines\research.dm"