diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 4ac6f9ec389..4b56b64c35f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -51,43 +51,43 @@ /datum/gear/accessory/holster display_name = "holster selection (Security, SM, HoP, Exploration)" - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder") + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder","Talon Guard") /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner") + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/black_vest display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner") + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/white_vest display_name = "webbing, white (Medical)" - allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Talon Doctor") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner") + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner") + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white (Medical)" - allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Talon Doctor") /datum/gear/accessory/bluespace display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)" path = /obj/item/clothing/accessory/storage/bluespace - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner") + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") cost = 2 /datum/gear/accessory/webbing cost = 1 /datum/gear/accessory/stethoscope - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic","Talon Doctor") /datum/gear/accessory/khcrystal display_name = "KH Life Crystal" @@ -103,7 +103,7 @@ display_name = "pilot qualification pin" description = "An iron pin denoting the qualification to fly SCG spacecraft." path = /obj/item/clothing/accessory/solgov/specialty/pilot - allowed_roles = list("Pathfinder", "Pilot", "Field Medic") + allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot") /datum/gear/accessory/flops display_name = "drop straps" diff --git a/maps/offmap_vr/talon/talon.dm b/maps/offmap_vr/talon/talon.dm index 45c5d28dc8f..74281e86b8a 100644 --- a/maps/offmap_vr/talon/talon.dm +++ b/maps/offmap_vr/talon/talon.dm @@ -292,7 +292,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/space/void/refurb/marine/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/security/talonguard + /obj/item/device/gps/security/talonguard, + /obj/item/weapon/melee/baton ) /obj/structure/closet/secure_closet/talon_doctor @@ -439,6 +440,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot/install_default_programs() ..() + hard_drive.store_file(new/datum/computer_file/program/ship_nav()) /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/engineer name = "engineer's laptop" diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 5ff5ada9881..461e64e0332 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -1511,6 +1511,7 @@ "db" = ( /obj/machinery/vending/engivend{ products = list(/obj/item/device/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm, /obj/item/weapon/circuitboard/guestpass, /obj/item/weapon/circuitboard/keycard_auth, /obj/item/weapon/circuitboard/photocopier, /obj/item/weapon/circuitboard/fax, /obj/item/weapon/circuitboard/request, /obj/item/weapon/circuitboard/microwave, /obj/item/weapon/circuitboard/washing, /obj/item/weapon/circuitboard/scanner_console, /obj/item/weapon/circuitboard/sleeper_console, /obj/item/weapon/circuitboard/body_scanner, /obj/item/weapon/circuitboard/sleeper, /obj/item/weapon/circuitboard/dna_analyzer, /obj/item/weapon/circuitboard/partslathe); + req_access = list(301); req_log_access = 301 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -2472,6 +2473,7 @@ "mS" = ( /obj/structure/table/standard, /obj/fiftyspawner/steel, +/obj/fiftyspawner/copper, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/talon/deckone/workroom) "mT" = ( diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index a737f96bd06..2b9807f28fe 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -150,7 +150,6 @@ /decl/hierarchy/outfit/job/talon_pilot name = OUTFIT_JOB_NAME("Talon Pilot") - id_pda_assignment = "Pilot" id_slot = slot_wear_id pda_type = null