From eb6c4827941417e129c6f7ea539a96cfea876325 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sun, 14 Jan 2018 19:30:44 -0500 Subject: [PATCH] Shamelessly steal Polaris' Southern Cross jobs They're whitelist only for now, good for events and adminbuse. --- code/game/jobs/job/special_sc_vr.dm | 194 ++++++++++++++++++ code/game/jobs/jobs.dm | 7 +- .../items/devices/radio/encryptionkey_vr.dm | 15 ++ maps/tether/tether-01-surface.dmm | 10 +- maps/tether/tether_telecomms.dm | 30 ++- vorestation.dme | 2 + 6 files changed, 250 insertions(+), 8 deletions(-) create mode 100644 code/game/jobs/job/special_sc_vr.dm create mode 100644 code/game/objects/items/devices/radio/encryptionkey_vr.dm diff --git a/code/game/jobs/job/special_sc_vr.dm b/code/game/jobs/job/special_sc_vr.dm new file mode 100644 index 0000000000..8750fc6578 --- /dev/null +++ b/code/game/jobs/job/special_sc_vr.dm @@ -0,0 +1,194 @@ +//These are a copy of Polaris' Southern Cross jobs + +var/const/access_pilot = 67 +var/const/access_explorer = 43 + +//////////////////////////////////////////////////////////// + +/datum/access/pilot + id = access_pilot + desc = "Pilot" + region = ACCESS_REGION_SUPPLY + +/datum/access/explorer + id = access_explorer + desc = "Explorer" + region = ACCESS_REGION_GENERAL + +//////////////////////////////////////////////////////////// + +/obj/item/weapon/card/id/medical/sar + assignment = "Search and Rescue" + rank = "Search and Rescue" + job_access_type = /datum/job/sar + +/obj/item/weapon/card/id/civilian/pilot + assignment = "Pilot" + rank = "Pilot" + job_access_type = /datum/job/pilot + +/obj/item/weapon/card/id/civilian/explorer + assignment = "Explorer" + rank = "Explorer" + job_access_type = /datum/job/explorer + +//////////////////////////////////////////////////////////// + +/datum/job/pilot + title = "Pilot" + flag = PILOT + department = "Civilian" + department_flag = MEDSCI + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the head of personnel" + selection_color = "#515151" + idtype = /obj/item/weapon/card/id/civilian/pilot + economic_modifier = 4 + whitelist_only = 1 + latejoin_only = 1 + access = list(access_pilot, access_cargo, access_mining, access_mining_station) + minimal_access = list(access_pilot, access_cargo, access_mining, access_mining_station) + outfit_type = /decl/hierarchy/outfit/job/pilot + +/datum/job/explorer + title = "Explorer" + flag = EXPLORER + department = "Science" + department_flag = MEDSCI + faction = "Station" + total_positions = 4 + spawn_positions = 4 + supervisors = "the explorer leader and the head of personnel" + selection_color = "#515151" + idtype = /obj/item/weapon/card/id/civilian/explorer + economic_modifier = 4 + whitelist_only = 1 + latejoin_only = 1 + access = list(access_pilot, access_explorer) + minimal_access = list(access_pilot, access_explorer) + outfit_type = /decl/hierarchy/outfit/job/explorer2 +/* I split this into multiple jobs because it's set to latejoin_only, which means you can't see it to select alt titles. + alt_titles = list( + "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, + "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) +*/ + +/datum/job/explorer/technician + title = "Explorer Technician" + flag = EXPLORER_T + outfit_type = /decl/hierarchy/outfit/job/explorer2/technician + +/datum/job/explorer/medic + title = "Explorer Medic" + flag = EXPLORER_M + outfit_type = /decl/hierarchy/outfit/job/explorer2/medic + +/datum/job/sar + title = "Search and Rescue" + flag = SAR + department = "Medical" + department_flag = MEDSCI + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the chief medical officer" + selection_color = "#515151" + idtype = /obj/item/weapon/card/id/medical + economic_modifier = 4 + whitelist_only = 1 + latejoin_only = 1 + access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) + outfit_type = /decl/hierarchy/outfit/job/medical/sar + +//////////////////////////////////////////////////////////// + +/decl/hierarchy/outfit/job/explorer2 + name = OUTFIT_JOB_NAME("Explorer") + shoes = /obj/item/clothing/shoes/boots/winter/explorer + uniform = /obj/item/clothing/under/explorer + l_ear = /obj/item/device/radio/headset/explorer + id_slot = slot_wear_id + pda_slot = slot_l_store + pda_type = /obj/item/device/pda/cargo // Brown looks more rugged + id_type = /obj/item/weapon/card/id/civilian/explorer + id_pda_assignment = "Explorer" + +/decl/hierarchy/outfit/job/explorer2/technician + name = OUTFIT_JOB_NAME("Explorer Technician") + belt = /obj/item/weapon/storage/belt/utility/full + pda_slot = slot_l_store + id_pda_assignment = "Explorer Technician" + +/decl/hierarchy/outfit/job/explorer2/medic + name = OUTFIT_JOB_NAME("Explorer Medic") + l_hand = /obj/item/weapon/storage/firstaid/regular + pda_slot = slot_l_store + id_pda_assignment = "Explorer Medic" + +/decl/hierarchy/outfit/job/pilot + name = OUTFIT_JOB_NAME("Pilot") + shoes = /obj/item/clothing/shoes/black + uniform = /obj/item/clothing/under/color/black + suit = /obj/item/clothing/suit/storage/toggle/bomber + gloves = /obj/item/clothing/gloves/fingerless + glasses = /obj/item/clothing/glasses/fakesunglasses/aviator + l_ear = /obj/item/device/radio/headset/pilot + id_slot = slot_wear_id + pda_slot = slot_belt + pda_type = /obj/item/device/pda/cargo // Brown looks more rugged + id_type = /obj/item/weapon/card/id/civilian/pilot + id_pda_assignment = "Pilot" + +/decl/hierarchy/outfit/job/medical/sar + name = OUTFIT_JOB_NAME("Search and Rescue") + uniform = /obj/item/clothing/under/utility/blue + suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar + shoes = /obj/item/clothing/shoes/boots/winter/explorer + l_hand = /obj/item/weapon/storage/firstaid/adv + belt = /obj/item/weapon/storage/belt/medical/emt + pda_slot = slot_l_store + id_type = /obj/item/weapon/card/id/medical/sar + id_pda_assignment = "Search and Rescue" + flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL + +//////////////////////////////////////////////////////////// + +/obj/item/device/encryptionkey/pilot + name = "pilot's encryption key" + icon_state = "com_cypherkey" + channels = list("Supply" = 1, "Explorer" = 1) + +/obj/item/device/encryptionkey/explorer + name = "explorer radio encryption key" + icon_state = "com_cypherkey" + channels = list("Explorer" = 1) + +//////////////////////////////////////////////////////////// + +/obj/item/device/radio/headset/pilot + name = "pilot's headset" + desc = "A bowman headset used by pilots, has access to supply and explorer channels." + icon_state = "cargo_headset_alt" + item_state = "headset" + ks2type = /obj/item/device/encryptionkey/pilot + +/obj/item/device/radio/headset/explorer + name = "explorer's headset" + desc = "Headset used by explorers for exploring. Access to the explorer channel." + icon_state = "mine_headset" + item_state = "headset" + ks2type = /obj/item/device/encryptionkey/explorer + +//////////////////////////////////////////////////////////// + +/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar + name = "search and rescue winter coat" + desc = "A heavy winter jacket. A white star of life is emblazoned on the back, with the words search and rescue written underneath." + icon_state = "coatsar" + item_icons = list(slot_wear_suit_str = 'maps/southern_cross/icons/mob/sc_suit.dmi') + icon = 'maps/southern_cross/icons/obj/sc_suit.dmi' + armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5) + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 6da23b1d0f..8333f0198e 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -26,7 +26,11 @@ var/const/PSYCHIATRIST =(1<<7) var/const/ROBOTICIST =(1<<8) var/const/XENOBIOLOGIST =(1<<9) var/const/PARAMEDIC =(1<<10) - +var/const/SAR =(1<<11) //VOREStation THEFT +var/const/PILOT =(1<<12) //VOREStation THEFT +var/const/EXPLORER =(1<<13) //VOREStation THEFT +var/const/EXPLORER_T =(1<<14) //VOREStation THEFT +var/const/EXPLORER_M =(1<<15) //VOREStation THEFT var/const/CIVILIAN =(1<<2) @@ -46,7 +50,6 @@ var/const/BRIDGE =(1<<12) var/const/CLOWN =(1<<13) //VOREStation Add var/const/MIME =(1<<14) //VOREStation Add - var/list/assistant_occupations = list( ) diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm new file mode 100644 index 0000000000..b9ad7f72c1 --- /dev/null +++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm @@ -0,0 +1,15 @@ +/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" = 0, "Explorer" = 0) + +/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) + +/obj/item/device/encryptionkey/heads/captain + name = "colony director's encryption key" + icon_state = "cap_cypherkey" + channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Explorer" = 0) diff --git a/maps/tether/tether-01-surface.dmm b/maps/tether/tether-01-surface.dmm index 13b689adc5..c8a62750ed 100644 --- a/maps/tether/tether-01-surface.dmm +++ b/maps/tether/tether-01-surface.dmm @@ -3139,6 +3139,7 @@ "bis" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/server) "bit" = (/obj/machinery/r_n_d/server/core,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/server) "biu" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/yellow/border{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/machinery/camera/network/engineering{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/hallway) +"biv" = (/obj/machinery/telecomms/server/presets/service/tether,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "biw" = (/obj/item/clothing/shoes/clown_shoes,/obj/item/clothing/mask/gas/clown_hat,/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/hallway) "bix" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/yellow/border{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/lower/atmos_lockers) "biy" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/engineering/lower/atmos_lockers) @@ -3608,7 +3609,7 @@ "bru" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/techmaint,/area/tcomfoyer{name = "\improper Telecomms Storage"}) "brv" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor/tiled/techmaint,/area/tcomfoyer{name = "\improper Telecomms Storage"}) "brw" = (/obj/machinery/telecomms/server/presets/supply,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) -"brx" = (/obj/machinery/telecomms/server/presets/service,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) +"brx" = (/obj/machinery/telecomms/bus/preset_two/tether,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "bry" = (/obj/machinery/telecomms/server/presets/unused,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brz" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brA" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -3623,11 +3624,10 @@ "brJ" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor/tiled/techmaint,/area/tcomfoyer{name = "\improper Telecomms Storage"}) "brK" = (/obj/structure/sign/nosmoking_2{pixel_x = -32; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brL" = (/obj/machinery/telecomms/processor/preset_two,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) -"brM" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) +"brM" = (/obj/machinery/telecomms/receiver/preset_right/tether,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brN" = (/obj/machinery/telecomms/relay/preset/tether/base_high,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brO" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brP" = (/obj/machinery/telecomms/hub/preset/tether,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) -"brQ" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brR" = (/obj/machinery/telecomms/relay/preset/tether/base_low,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brS" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "brT" = (/obj/machinery/telecomms/processor/preset_four,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -5875,9 +5875,9 @@ aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaL aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLbmPaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbbMbbMbbMbpvbpvbpvbpvbpobqNbqObqPbqNbqtbqtbqtbqtbqtbqQbqRbqSbqTbqUbqtbqtbqVbqtbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLbqWbqXbqXbqXbqXbqXbqXbqXbqXbqXaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbqZbqZbrabqZbqtbrbbrbbrbbrcbrdbrebrfbrgbrhbribrjbrkbrlbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbrmbrnbrobrpbqtbrbbrkbrkbrkbrqbrkbrrbrkbrqbrkbrkbrkbrbbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK -aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbrsbrtbrubrvbqtbrbbrwbrxbrybrqbrkbrbbrkbrqbrkbrzbrAbrbbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK +aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbrsbrtbrubrvbqtbrbbrwbivbrybrqbrkbrbbrkbrqbrkbrzbrAbrbbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbrBbrCbrCbrDbqtbrEbrkbrkbrkbrqbrkbrFbrkbrqbrkbrkbrkbrGbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK -aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbrHbrIbrJbqYbqtbrKbrLbrMbrNbrhbrObrPbrQbrhbrRbrSbrTbrUbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK +aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbrHbrIbrJbqYbqtbrKbrLbrxbrNbrhbrObrPbrMbrhbrRbrSbrTbrUbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqYbqYbqYbqYbqYbqtbrbbrVbrWbrkbrqbrkbrbbrkbrqbrkbrXbrYbrbbqtaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqtbXjbrkbrkbrkbrqbrkbsabrkbrqbrkbrkbrkbrbbqtaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMbqtbrbbsbbscbsdbsebrkbsfbrkbsgbshbsibsjbrbbqtaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index 3a8e567a5e..d5a25a8b57 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -45,10 +45,20 @@ autolinkers = list("hub", "tbl_relay", "tbm_relay", "tbh_relay", "tsl_relay", "tsm_relay", "tsh_relay", "c_relay", "m_relay", "r_relay", "sci_o_relay", - "science", "medical", "supply", "service", "common", "command", "engineering", "security", "unused", + "science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused", "hb_relay", "receiverA", "broadcasterA" ) +/obj/machinery/telecomms/receiver/preset_right/tether + freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ) + +/obj/machinery/telecomms/bus/preset_two/tether + freq_listening = list(SUP_FREQ, SRV_FREQ, EXP_FREQ) + +/obj/machinery/telecomms/server/presets/service/tether + freq_listening = list(SRV_FREQ, EXP_FREQ) + autolinkers = list("service", "explorer") + // Telecommunications Satellite /area/tether/surfacebase/tcomms name = "\improper Telecomms" @@ -80,3 +90,21 @@ /area/maintenance/station/tcomms name = "\improper Telecoms Maintenance" + +/datum/map/tether/default_internal_channels() + return list( + num2text(PUB_FREQ) = list(), + num2text(AI_FREQ) = list(access_synth), + num2text(ENT_FREQ) = list(), + num2text(ERT_FREQ) = list(access_cent_specops), + num2text(COMM_FREQ)= list(access_heads), + num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics), + num2text(MED_FREQ) = list(access_medical_equip), + num2text(MED_I_FREQ)=list(access_medical_equip), + num2text(SEC_FREQ) = list(access_security), + num2text(SEC_I_FREQ)=list(access_security), + num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), + num2text(SUP_FREQ) = list(access_cargo), + num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), + num2text(EXP_FREQ) = list(access_explorer) + ) diff --git a/vorestation.dme b/vorestation.dme index 4383b8787a..a7afc4a1c6 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -605,6 +605,7 @@ #include "code\game\jobs\job\security.dm" #include "code\game\jobs\job\silicon.dm" #include "code\game\jobs\job\special.dm" +#include "code\game\jobs\job\special_sc_vr.dm" #include "code\game\jobs\job\z_all_jobs_vr.dm" #include "code\game\machinery\adv_med.dm" #include "code\game\machinery\adv_med_vr.dm" @@ -936,6 +937,7 @@ #include "code\game\objects\items\devices\radio\beacon.dm" #include "code\game\objects\items\devices\radio\electropack.dm" #include "code\game\objects\items\devices\radio\encryptionkey.dm" +#include "code\game\objects\items\devices\radio\encryptionkey_vr.dm" #include "code\game\objects\items\devices\radio\headset.dm" #include "code\game\objects\items\devices\radio\headset_vr.dm" #include "code\game\objects\items\devices\radio\intercom.dm"