diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 31e0cc4fc1..f956c23fa9 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -147,6 +147,16 @@ var/list/whitelisted_positions = list( "AI" ) +<<<<<<< HEAD +======= +var/const/TALCAP =(1<<0) +var/const/TALPIL =(1<<1) +var/const/TALDOC =(1<<2) +var/const/TALSEC =(1<<3) +var/const/TALENG =(1<<4) +var/const/TALMIN =(1<<5) +//VOREStation Add End +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /proc/guest_jobbans(var/job) return ((job in whitelisted_positions)) diff --git a/code/game/machinery/suit_cycler_datums.dm b/code/game/machinery/suit_cycler_datums.dm index 3fc8d01039..4d84d116af 100644 --- a/code/game/machinery/suit_cycler_datums.dm +++ b/code/game/machinery/suit_cycler_datums.dm @@ -286,6 +286,10 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Talon Pilot (Closed Helm)" helmet_becomes = /obj/item/clothing/head/helmet/space/void/refurb/pilot/alt/talon suit_becomes = /obj/item/clothing/suit/space/void/refurb/pilot/talon +/datum/suit_cycler_choice/department/talon/miner + name = "Talon Miner" + helmet_becomes = /obj/item/clothing/head/helmet/space/void/refurb/mining/talon + suit_becomes = /obj/item/clothing/suit/space/void/refurb/mining/talon /datum/suit_cycler_choice/department/talon/res name = "Talon Research (Bubble Helm)" helmet_becomes = /obj/item/clothing/head/helmet/space/void/refurb/research/alt/talon diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 806cf1e773..25cfd1121c 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -53,3 +53,12 @@ model_text = "Talon captain" req_access = list(access_talon) departments = list(/datum/suit_cycler_choice/department/talon/officer) +<<<<<<< HEAD +======= + +/obj/machinery/suit_cycler/vintage/tminer + name = "Talon miner suit cycler" + model_text = "Talon miner" + req_access = list(access_talon) + departments = list(/datum/suit_cycler_choice/department/talon/miner) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 4e08cb7581..974b34a93f 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -90,3 +90,5 @@ name = "Talon Guard" /obj/effect/landmark/start/talonpilot name = "Talon Pilot" +/obj/effect/landmark/start/talonminer + name = "Talon Miner" diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm index 13680cadbe..159041e571 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -261,6 +261,10 @@ name = "Talon Pilot ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple") +/obj/item/weapon/card/id/talon/miner + name = "Talon Mining ID" + initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-brown", "stripe-brown") + /obj/item/weapon/card/id/talon/captain name = "Talon Captain ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold") diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index a3cd6ad35c..286b9f3e79 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -208,6 +208,7 @@ "Shaft Miner" = "itg", "Intern" = "itg", "Talon Pilot" = "itg", + "Talon Miner" = "itg", "Bartender" = "itg_green", "Botanist" = "itg_green", "Chef" = "itg_green", diff --git a/code/game/objects/random/spacesuits.dm b/code/game/objects/random/spacesuits.dm index 5db5bbb074..00416fa19a 100644 --- a/code/game/objects/random/spacesuits.dm +++ b/code/game/objects/random/spacesuits.dm @@ -227,6 +227,7 @@ /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot ), + prob(10);list( /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot/alt @@ -239,6 +240,10 @@ /obj/item/clothing/suit/space/void/refurb/research, /obj/item/clothing/head/helmet/space/void/refurb/research/alt ), + prob(10);list( + /obj/item/clothing/suit/space/void/refurb/mining, + /obj/item/clothing/head/helmet/space/void/refurb/mining + ), prob(5);list( /obj/item/clothing/suit/space/void/refurb/mercenary, /obj/item/clothing/head/helmet/space/void/refurb/mercenary diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm index de02a4baf6..0f85ed63c8 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm @@ -32,6 +32,11 @@ "stripes_horizontal" = COLOR_SKY_BLUE ) +/decl/closet_appearance/secure_closet/talon/miner + extra_decals = list( + "stripes_horizontal" = COLOR_BEASTY_BROWN + ) + /decl/closet_appearance/secure_closet/talon/captain extra_decals = list( "stripes_horizontal" = COLOR_GOLD 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 c5f314aea1..59c49b1b53 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -58,11 +58,19 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" +<<<<<<< HEAD allowed_roles = list("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", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/black_vest display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" allowed_roles = list("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", "Blueshield Guard","Security Pilot") //YW ADDITIONS +======= + allowed_roles = list("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", "Talon Miner") + +/datum/gear/accessory/black_vest + display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" + allowed_roles = list("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", "Talon Miner") +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /datum/gear/accessory/white_vest display_name = "webbing, white (Medical)" @@ -70,11 +78,19 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)" +<<<<<<< HEAD allowed_roles = list("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", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" allowed_roles = list("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", "Blueshield Guard","Security Pilot") //YW ADDITIONS +======= + allowed_roles = list("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", "Talon Miner") + +/datum/gear/accessory/black_drop_pouches + display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" + allowed_roles = list("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", "Talon Miner") +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white (Medical)" @@ -83,7 +99,11 @@ /datum/gear/accessory/bluespace display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)" path = /obj/item/clothing/accessory/storage/bluespace +<<<<<<< HEAD allowed_roles = list("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("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", "Talon Miner") +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining cost = 2 /datum/gear/accessory/webbing diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm index a80b3eb972..0fff3afcad 100644 --- a/code/modules/clothing/spacesuits/void/event.dm +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -260,6 +260,32 @@ /obj/item/weapon/cell ) +//Miner's Crewsuit (BROWN) +//Basically just the basic suit, but with brown markings. If anyone wants to tweak this, go wild. +/obj/item/clothing/head/helmet/space/void/refurb/mining + name = "vintage miner's's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one has brown markings, denoting it as a miner's helmet." + icon_state = "rig0-vintageminer" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + light_overlay = "helmet_light" + +/obj/item/clothing/suit/space/void/refurb/mining + name = "vintage miner's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one has brown markings, denoting it as a miner's suit." + icon_state = "rig-vintageminer" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/storage/briefcase/inflatable, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel + ) + //Mercenary Crewsuit (RED, CROSS) //The best of the best, this should be ultra-rare /obj/item/clothing/head/helmet/space/void/refurb/mercenary diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index a786acfd51..dd8e8fce2c 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -55,6 +55,15 @@ /obj/item/clothing/suit/space/void/refurb/pilot/talon name = "talon pilot voidsuit" +/obj/item/clothing/head/helmet/space/void/refurb/mining/talon + name = "talon miner voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. \"ITV TALON\" has been stamped onto the sides of the helmet." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/mining/talon + name = "talon miner voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. \"ITV TALON\" is stamped across the left side of the breastplate in faded faux-gold." + /obj/item/clothing/head/helmet/space/void/refurb/research/talon name = "talon scientific voidsuit helmet" camera_networks = list(NETWORK_TALON_HELMETS) diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index f09f004d38..bfdea47a73 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/item_skrell.dmi b/icons/inventory/head/item_skrell.dmi index 3977261932..86844d8526 100644 Binary files a/icons/inventory/head/item_skrell.dmi and b/icons/inventory/head/item_skrell.dmi differ diff --git a/icons/inventory/head/item_tajaran.dmi b/icons/inventory/head/item_tajaran.dmi index b4fd4241e0..b649db2403 100644 Binary files a/icons/inventory/head/item_tajaran.dmi and b/icons/inventory/head/item_tajaran.dmi differ diff --git a/icons/inventory/head/item_unathi.dmi b/icons/inventory/head/item_unathi.dmi index a3a6bf1fff..96ae1725cd 100644 Binary files a/icons/inventory/head/item_unathi.dmi and b/icons/inventory/head/item_unathi.dmi differ diff --git a/icons/inventory/head/item_vr_akula.dmi b/icons/inventory/head/item_vr_akula.dmi index 3fd5294057..cf2ea23141 100644 Binary files a/icons/inventory/head/item_vr_akula.dmi and b/icons/inventory/head/item_vr_akula.dmi differ diff --git a/icons/inventory/head/item_vr_sergal.dmi b/icons/inventory/head/item_vr_sergal.dmi index 48908b9e39..e9536d2ecc 100644 Binary files a/icons/inventory/head/item_vr_sergal.dmi and b/icons/inventory/head/item_vr_sergal.dmi differ diff --git a/icons/inventory/head/item_vr_vulpkanin.dmi b/icons/inventory/head/item_vr_vulpkanin.dmi index dce35a0549..c3be906c44 100644 Binary files a/icons/inventory/head/item_vr_vulpkanin.dmi and b/icons/inventory/head/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 041377230a..17728e25f6 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/head/mob_skrell.dmi b/icons/inventory/head/mob_skrell.dmi index e862a0730e..ab3267b937 100644 Binary files a/icons/inventory/head/mob_skrell.dmi and b/icons/inventory/head/mob_skrell.dmi differ diff --git a/icons/inventory/head/mob_tajaran.dmi b/icons/inventory/head/mob_tajaran.dmi index 6493b9948f..3527c445b7 100644 Binary files a/icons/inventory/head/mob_tajaran.dmi and b/icons/inventory/head/mob_tajaran.dmi differ diff --git a/icons/inventory/head/mob_unathi.dmi b/icons/inventory/head/mob_unathi.dmi index c48827c6bf..d78cf385aa 100644 Binary files a/icons/inventory/head/mob_unathi.dmi and b/icons/inventory/head/mob_unathi.dmi differ diff --git a/icons/inventory/head/mob_vr_akula.dmi b/icons/inventory/head/mob_vr_akula.dmi index a952c48923..6ea289d7f7 100644 Binary files a/icons/inventory/head/mob_vr_akula.dmi and b/icons/inventory/head/mob_vr_akula.dmi differ diff --git a/icons/inventory/head/mob_vr_sergal.dmi b/icons/inventory/head/mob_vr_sergal.dmi index d1c60634b2..eb67a6dc5c 100644 Binary files a/icons/inventory/head/mob_vr_sergal.dmi and b/icons/inventory/head/mob_vr_sergal.dmi differ diff --git a/icons/inventory/head/mob_vr_vulpkanin.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi index 902887853f..d829c51711 100644 Binary files a/icons/inventory/head/mob_vr_vulpkanin.dmi and b/icons/inventory/head/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 350042d701..4e8e3f8657 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/item_skrell.dmi b/icons/inventory/suit/item_skrell.dmi index d0ac340426..6e7e1a49f5 100644 Binary files a/icons/inventory/suit/item_skrell.dmi and b/icons/inventory/suit/item_skrell.dmi differ diff --git a/icons/inventory/suit/item_tajaran.dmi b/icons/inventory/suit/item_tajaran.dmi index 6b12d49204..1b36db164d 100644 Binary files a/icons/inventory/suit/item_tajaran.dmi and b/icons/inventory/suit/item_tajaran.dmi differ diff --git a/icons/inventory/suit/item_unathi.dmi b/icons/inventory/suit/item_unathi.dmi index e9870c4f97..d99bc1a683 100644 Binary files a/icons/inventory/suit/item_unathi.dmi and b/icons/inventory/suit/item_unathi.dmi differ diff --git a/icons/inventory/suit/item_vr_akula.dmi b/icons/inventory/suit/item_vr_akula.dmi index 4804ce6e4a..1cc43648d4 100644 Binary files a/icons/inventory/suit/item_vr_akula.dmi and b/icons/inventory/suit/item_vr_akula.dmi differ diff --git a/icons/inventory/suit/item_vr_sergal.dmi b/icons/inventory/suit/item_vr_sergal.dmi index 1c30a0b6af..2af20ae433 100644 Binary files a/icons/inventory/suit/item_vr_sergal.dmi and b/icons/inventory/suit/item_vr_sergal.dmi differ diff --git a/icons/inventory/suit/item_vr_vulpkanin.dmi b/icons/inventory/suit/item_vr_vulpkanin.dmi index 92b5f1fc06..6dbafa8c48 100644 Binary files a/icons/inventory/suit/item_vr_vulpkanin.dmi and b/icons/inventory/suit/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index aa8e611f91..9aa489853f 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_skrell.dmi b/icons/inventory/suit/mob_skrell.dmi index 45b47bb1df..6e369c2071 100644 Binary files a/icons/inventory/suit/mob_skrell.dmi and b/icons/inventory/suit/mob_skrell.dmi differ diff --git a/icons/inventory/suit/mob_tajaran.dmi b/icons/inventory/suit/mob_tajaran.dmi index 22afb1bd85..0ae85bd0c4 100644 Binary files a/icons/inventory/suit/mob_tajaran.dmi and b/icons/inventory/suit/mob_tajaran.dmi differ diff --git a/icons/inventory/suit/mob_unathi.dmi b/icons/inventory/suit/mob_unathi.dmi index 1fd3aaba97..1926142454 100644 Binary files a/icons/inventory/suit/mob_unathi.dmi and b/icons/inventory/suit/mob_unathi.dmi differ diff --git a/icons/inventory/suit/mob_vr_akula.dmi b/icons/inventory/suit/mob_vr_akula.dmi index 3ab9c20220..3de3f4b632 100644 Binary files a/icons/inventory/suit/mob_vr_akula.dmi and b/icons/inventory/suit/mob_vr_akula.dmi differ diff --git a/icons/inventory/suit/mob_vr_sergal.dmi b/icons/inventory/suit/mob_vr_sergal.dmi index 66ed483095..9cc66a352f 100644 Binary files a/icons/inventory/suit/mob_vr_sergal.dmi and b/icons/inventory/suit/mob_vr_sergal.dmi differ diff --git a/icons/inventory/suit/mob_vr_vulpkanin.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi index 8e6bf59b58..aa79c164a5 100644 Binary files a/icons/inventory/suit/mob_vr_vulpkanin.dmi and b/icons/inventory/suit/mob_vr_vulpkanin.dmi differ diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index ad8dbf39a9..97a4cd5a70 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -11,7 +11,7 @@ var/global/list/latejoin_talon = list() /datum/spawnpoint/talon display_name = "ITV Talon Cryo" - restrict_job = list("Talon Captain", "Talon Pilot", "Talon Engineer", "Talon Doctor", "Talon Guard") + restrict_job = list("Talon Captain", "Talon Pilot", "Talon Engineer", "Talon Doctor", "Talon Guard", "Talon Miner") msg = "has come out of cryostasis" announce_channel = "Talon" @@ -279,6 +279,12 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k /obj/item/clothing/suit/space/void/pilot/talon name = "talon pilot's voidsuit" +/obj/item/clothing/head/helmet/space/void/mining/talon + name = "talon miner's voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) +/obj/item/clothing/suit/space/void/mining/talon + name = "talon miner's voidsuit" + /obj/item/device/gps/command/taloncap gps_tag = "TALC" /obj/item/device/gps/security/talonguard @@ -289,6 +295,8 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k gps_tag = "TALE" /obj/item/device/gps/explorer/talonpilot gps_tag = "TALP" +/obj/item/device/gps/mining/talonminer + gps_tag = "TALM" /obj/structure/closet/secure_closet/talon_captain name = "talon captain's locker" @@ -404,6 +412,29 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k /obj/item/device/gps/explorer/talonpilot ) +/obj/structure/closet/secure_closet/talon_miner + name = "talon miner's locker" + req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/miner + + starts_with = list( + /obj/item/device/radio/headset/talon, + /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, + /obj/item/clothing/suit/space/void/refurb/mining/talon, + /obj/item/weapon/tank/oxygen, + /obj/item/device/suit_cooling_unit, + /obj/item/device/gps/mining/talonminer, + /obj/item/clothing/gloves/black, + /obj/item/device/analyzer, + /obj/item/weapon/storage/bag/ore, + /obj/item/device/flashlight/lantern, + /obj/item/weapon/shovel, + /obj/item/weapon/pickaxe, + /obj/item/weapon/mining_scanner, + /obj/item/clothing/glasses/material, + /obj/item/clothing/glasses/meson + ) + /obj/machinery/vending/medical_talon //Not a subtype for *reasons* name = "NanoMed Plus" desc = "Medical drug dispenser." @@ -507,6 +538,13 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k hard_drive.store_file(new/datum/computer_file/program/camera_monitor/talon_helmet()) set_autorun("tsensormonitor") +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner + name = "miner's laptop" + +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner/install_default_programs() + ..() + hard_drive.store_file(new/datum/computer_file/program/ship_nav()) + //Generic modular consoles scattered around /obj/item/modular_computer/console/preset/talon name = "talon modular computer" diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 52be2aad03..2dd91e9f43 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -241,6 +241,7 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/med_room) "ax" = ( +<<<<<<< HEAD /obj/structure/closet/secure_closet/talon_engineer, /obj/item/device/radio/off{ channels = list("Talon" = 1) @@ -248,6 +249,13 @@ /obj/item/weapon/storage/box/nifsofts_engineering, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/eng_room) +======= +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "ay" = ( /obj/machinery/disposal/wall{ dir = 4 @@ -1166,12 +1174,31 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/talon_v2/maintenance/wing_starboard) +<<<<<<< HEAD "dh" = ( /obj/structure/ore_box, /obj/structure/railing/grey, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) "di" = ( +======= +"de" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"df" = ( +/obj/effect/landmark/start{ + name = "Talon Miner" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"di" = ( +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"dj" = ( +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/machinery/door/firedoor/glass/talon, /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2188,6 +2215,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 }, +<<<<<<< HEAD /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 1; id_tag = "talon_port"; @@ -2202,6 +2230,16 @@ d1 = 2; d2 = 8; icon_state = "2-8" +======= +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"gd" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"ge" = ( +/obj/machinery/vending/coffee{ + dir = 1 +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2598,8 +2636,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) +======= +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "hp" = ( /obj/machinery/atmospherics/binary/algae_farm/filled{ dir = 1 @@ -2844,6 +2890,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, +<<<<<<< HEAD /obj/structure/handrail, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -2857,6 +2904,23 @@ dir = 8 }, /obj/structure/window/reinforced{ +======= +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"iq" = ( +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"ir" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"is" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 4 }, /obj/machinery/door/blast/regular/open{ @@ -2878,6 +2942,20 @@ d2 = 2; icon_state = "1-2" }, +<<<<<<< HEAD +======= +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"ix" = ( +/obj/structure/table/woodentable, +/obj/machinery/recharger, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"iy" = ( +/obj/structure/catwalk, +/obj/structure/trash_pile, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_port) "iz" = ( @@ -3210,11 +3288,22 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/refining) "jY" = ( +<<<<<<< HEAD /obj/structure/table/steel, /obj/item/weapon/storage/bag/ore, /obj/item/weapon/pickaxe/drill, +======= +/obj/structure/closet/crate, +/obj/structure/railing/grey, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) +"jZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) "kc" = ( /obj/machinery/conveyor{ dir = 1; @@ -3707,13 +3796,24 @@ /turf/simulated/floor/plating, /area/talon_v2/maintenance/fore_starboard) "lA" = ( +<<<<<<< HEAD /obj/machinery/light/small, /obj/structure/railing/grey{ dir = 4 }, /obj/structure/window/reinforced{ dir = 4 +======= +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) "lB" = ( @@ -4030,7 +4130,47 @@ /obj/structure/cable/green{ d1 = 4; d2 = 8; +<<<<<<< HEAD icon_state = "4-8" +======= + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"mH" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"mI" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"mL" = ( +/obj/machinery/mineral/unloading_machine, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"mN" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"mO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ @@ -4466,6 +4606,7 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) +<<<<<<< HEAD "om" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, @@ -4475,6 +4616,40 @@ d1 = 1; d2 = 4; icon_state = "1-4" +======= +"od" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"oh" = ( +/obj/item/weapon/storage/dicecup/loaded{ + pixel_x = 7; + pixel_y = 11 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/table/marble, +/obj/item/weapon/deck/cards{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"ok" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/brown, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"ol" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Talon Guard" +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4517,6 +4692,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) "ow" = ( @@ -5112,11 +5292,20 @@ d2 = 8; icon_state = "1-8" }, +<<<<<<< HEAD /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, /turf/simulated/floor/reinforced/airless, /area/space) +======= +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"qA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "qC" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/maintenance/engi{ @@ -5180,7 +5369,38 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +<<<<<<< HEAD /obj/structure/disposalpipe/segment{ +======= +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"qO" = ( +/obj/machinery/cryopod/robot/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"qP" = ( +/obj/effect/landmark/talon, +/obj/structure/handrail, +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"qQ" = ( +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/obj/machinery/mineral/input, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/warning/moving_parts{ + pixel_y = -31 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"qU" = ( +/obj/effect/floor_decal/industrial/warning{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -6073,6 +6293,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/ore_box, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) "tK" = ( @@ -6565,6 +6786,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) "vy" = ( @@ -7004,6 +7230,7 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) +<<<<<<< HEAD "wZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -7017,6 +7244,28 @@ /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" +======= +"wY" = ( +/obj/machinery/light_switch{ + pixel_x = -5; + pixel_y = 26 + }, +/obj/machinery/button/remote/airlock{ + id = "talon_minerdoor"; + name = "Door Bolts"; + pixel_x = 5; + pixel_y = 28; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"xa" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) @@ -7550,9 +7799,20 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) "yU" = ( +<<<<<<< HEAD /obj/structure/table/woodentable, /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/engineer, /obj/machinery/atmospherics/unary/vent_scrubber/on{ +======= +/obj/machinery/suit_cycler/vintage/tminer, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"yV" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/obj/machinery/camera/network/talon{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 1 }, /obj/machinery/firealarm{ @@ -7601,6 +7861,16 @@ /obj/structure/railing/grey{ dir = 1 }, +<<<<<<< HEAD +======= +/obj/structure/table/rack/steel, +/obj/item/weapon/shovel, +/obj/item/weapon/mining_scanner, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"zd" = ( +/obj/structure/fitness/weightlifter, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/machinery/camera/network/talon{ dir = 4 }, @@ -7925,7 +8195,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_port) +<<<<<<< HEAD "Av" = ( +======= +"Ax" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Az" = ( +/obj/structure/table/rack/steel, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"AB" = ( +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/structure/catwalk, /obj/machinery/light/small{ dir = 8 @@ -8057,6 +8352,7 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) +<<<<<<< HEAD "AO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8110,6 +8406,14 @@ d2 = 8; icon_state = "4-8" }, +======= +"AY" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "talonrefinery" + }, +/obj/machinery/mineral/output, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_starboard) "AV" = ( @@ -43094,6 +43398,7 @@ aa d2 = 8; icon_state = "1-8" }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -43105,6 +43410,27 @@ aa "zJ" = ( /obj/machinery/vending/tool{ req_log_access = 301 +======= +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"BY" = ( +/obj/structure/bed/chair/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"BZ" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Cb" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) @@ -43669,11 +43995,24 @@ aa /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/multiple/corp_crate/talon_cargo, /turf/simulated/floor/tiled/techfloor, +<<<<<<< HEAD /area/talon_v2/maintenance/wing_starboard) "BH" = ( +======= +/area/talon_v2/bridge) +"Ec" = ( +/obj/machinery/door/airlock/maintenance/cargo{ + id_tag = talon_minerdoor; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/mine_room) +"Ee" = ( +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -43683,6 +44022,45 @@ aa /turf/simulated/floor/tiled/techmaint, /area/talon_v2/crew_quarters/restrooms) "BJ" = ( +======= +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Ef" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/gun/burst, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/accessory/holster/waist, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Ei" = ( +/obj/machinery/door/airlock/mining{ + id_tag = talon_minerdoor; + name = "Miner's Cabin"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/mine_room) +"Ej" = ( +/obj/structure/table/rack/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Ek" = ( +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -43704,6 +44082,34 @@ aa d2 = 8; icon_state = "2-8" }, +<<<<<<< HEAD +======= +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"Er" = ( +/obj/structure/loot_pile/maint/boxfort, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Eu" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/closet/secure_closet/talon_miner, +/obj/item/weapon/storage/box/nifsofts_mining, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Ev" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/warning/corner, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -45195,6 +45601,7 @@ aa /obj/structure/sink{ pixel_y = 22 }, +<<<<<<< HEAD /obj/structure/medical_stand/anesthetic, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) @@ -45209,6 +45616,20 @@ aa }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 +======= +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/closet/crate, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"Iu" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/structure/cable/green{ d1 = 4; @@ -45236,6 +45657,7 @@ aa /obj/machinery/light/small{ dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techfloor, /area/talon_v2/anomaly_storage) "GV" = ( @@ -45244,6 +45666,16 @@ aa pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ +======= +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"IB" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +"IC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 1 }, /obj/structure/railing/grey{ @@ -45354,9 +45786,25 @@ aa }, /obj/structure/catwalk, /turf/simulated/floor/plating, +<<<<<<< HEAD /area/talon_v2/engineering/port) "Ho" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +======= +/area/talon_v2/central_hallway/fore) +"IY" = ( +/obj/structure/sign/warning/moving_parts{ + pixel_y = -32 + }, +/obj/machinery/disposal/wall{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Jd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -45477,6 +45925,7 @@ aa pixel_y = -6; req_one_access = list(301) }, +<<<<<<< HEAD /obj/structure/girder, /obj/structure/railing/grey{ dir = 4 @@ -45498,6 +45947,33 @@ aa dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"JK" = ( +/obj/structure/table/woodentable, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"JL" = ( +/turf/simulated/wall/shull, +/area/talon_v2/ofd_ops) +"JM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/starboard) +"JN" = ( +/obj/structure/catwalk, +/obj/structure/barricade, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"JO" = ( +/obj/machinery/computer/ship/sensors{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 4 }, /obj/effect/catwalk_plated/dark, @@ -45735,8 +46211,26 @@ aa /obj/machinery/camera/network/talon{ dir = 1 }, +<<<<<<< HEAD /obj/structure/safe/floor{ name = "smuggling compartment" +======= +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Kw" = ( +/obj/machinery/alarm/talon{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Kx" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 5; + pixel_y = 24 +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /turf/simulated/floor/carpet/blucarpet, /area/talon_v2/crew_quarters/cap_room) @@ -46358,10 +46852,23 @@ aa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +<<<<<<< HEAD /obj/structure/closet/crate, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, +======= +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"LT" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /turf/simulated/floor/tiled/techfloor, /area/talon_v2/gen_store) "Ks" = ( @@ -46464,11 +46971,25 @@ aa /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, +<<<<<<< HEAD /obj/structure/closet/walllocker/medical/east, /obj/item/weapon/storage/firstaid/regular, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/extinguisher/mini, /obj/effect/floor_decal/industrial/warning/corner{ +======= +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"Mk" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +"Ml" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/vending/medical_talon{ +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -47783,6 +48304,23 @@ aa /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/wall/rshull, /area/talon_v2/engineering/port) +<<<<<<< HEAD +======= +"PA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "PB" = ( /obj/structure/cable/green{ d1 = 4; @@ -48488,9 +49026,31 @@ aa /turf/simulated/wall/shull, /area/talon_v2/medical) "RV" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /obj/effect/floor_decal/industrial/warning{ dir = 8 +======= +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"RY" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"RZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -48953,6 +49513,7 @@ aa name = "north bump"; pixel_y = 28 }, +<<<<<<< HEAD /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" @@ -48960,6 +49521,18 @@ aa /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) +======= +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"TH" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "TJ" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -48970,9 +49543,18 @@ aa /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_starboard) "TL" = ( +<<<<<<< HEAD /obj/machinery/alarm/talon{ dir = 8; pixel_x = 22 +======= +/obj/machinery/suit_cycler/vintage/tpilot, +/obj/machinery/button/remote/airlock{ + id = "talon_minerdoor"; + name = "Door Bolts"; + pixel_y = 28; + specialfunctions = 4 +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/structure/bed/pod, /obj/item/weapon/bedsheet/blue, @@ -49108,6 +49690,12 @@ aa /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_starboard) "Um" = ( +<<<<<<< HEAD +======= +/obj/machinery/camera/network/talon{ + dir = 4 + }, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/machinery/mineral/mint, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) @@ -49731,9 +50319,28 @@ aa d2 = 8; icon_state = "2-8" }, +<<<<<<< HEAD /turf/simulated/floor/plating, /area/talon_v2/central_hallway) "Wu" = ( +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"WB" = ( +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -50225,7 +50832,39 @@ aa name = "Cargo Loading Hatch" }, /turf/simulated/floor/tiled/techfloor/grid, +<<<<<<< HEAD /area/talon_v2/maintenance/wing_port) +======= +/area/talon_v2/maintenance/aft_port) +"Yh" = ( +/obj/machinery/suit_cycler/vintage/tcaptain, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Yj" = ( +/obj/structure/catwalk, +/obj/structure/closet/walllocker_double/west, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/stack/cable_coil/green, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Yk" = ( +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"Ym" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/bag/ore, +/obj/item/weapon/pickaxe/drill, +/obj/item/stack/marker_beacon/thirty, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "Yo" = ( /obj/structure/closet/emergsuit_wall{ dir = 4; @@ -50234,8 +50873,22 @@ aa /turf/simulated/floor/tiled/white, /area/talon_v2/medical) "Yp" = ( +<<<<<<< HEAD /obj/structure/disposalpipe/trunk{ dir = 8 +======= +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"Yq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining }, /obj/machinery/disposal/wall{ dir = 8 @@ -50656,6 +51309,7 @@ aa /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) "ZA" = ( +<<<<<<< HEAD /obj/machinery/light/small{ dir = 4 }, @@ -50664,6 +51318,13 @@ aa id = "talonrefinery" }, /obj/machinery/mineral/output, +======= +/obj/machinery/mineral/input, +/obj/machinery/conveyor{ + dir = 4; + id = "talonrefinery" + }, +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/refining) "ZB" = ( @@ -61978,11 +62639,19 @@ It jY jY Um +<<<<<<< HEAD WJ ms Ax yU wx +======= +TH +Ax +Eu +yU +IB +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining Wz fb iN @@ -62117,6 +62786,7 @@ LU LU vx or +<<<<<<< HEAD VS VS lA @@ -62125,6 +62795,16 @@ uk MO BZ FB +======= +or +PA +lA +Ei +RY +jZ +BZ +IB +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining hk fb Ll @@ -62260,6 +62940,7 @@ XR gR Yc VS +<<<<<<< HEAD OI qQ WJ @@ -62268,6 +62949,16 @@ gd IY IY IY +======= +de +qQ +qA +wY +gd +IY +Mk +LR +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining Jf Tg wZ @@ -62371,6 +63062,7 @@ aa aa aa aa +<<<<<<< HEAD hP EU EU @@ -62413,14 +63105,69 @@ nD fb pv cM +======= +aa +aa +aa +aa +Ue +Sg +Sg +rx +rx +jr +Sk +rc +Sk +Sk +uh +Sk +Sk +MG +RQ +rG +Fn +NZ +Na +BU +RQ +tX +lv +fW +PK +tJ +VS +YL +mL +IB +Kw +df +iq +IB +nD +et +pv +pv +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining tM fb uQ fi +<<<<<<< HEAD fi vE Tb Pf +======= +mg +fb +Tb +aL +aL +oE +iH +tS +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining in in in @@ -62430,17 +63177,30 @@ in in in in +<<<<<<< HEAD uv +======= +lY +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining in in in in +<<<<<<< HEAD Mf fh Dq fs KT fS +======= +KT +fS +Dq +Km +yz +Fa +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining XP XP aa @@ -62461,10 +63221,13 @@ aa aa aa aa +<<<<<<< HEAD aa aa aa aa +======= +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining "} (83,1,1) = {" aa @@ -62543,6 +63306,7 @@ VS XR Hg tJ +<<<<<<< HEAD kZ mP AY @@ -62551,6 +63315,20 @@ JK Yp ax kn +======= +VS +YL +AY +IB +JK +Yp +ax +IB +zA +pS +Xh +qM +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining WJ fb Xh @@ -62688,7 +63466,15 @@ Ly kc Ly ZA +<<<<<<< HEAD fW +======= +IB +ix +di +ok +IB +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining DD DD DD @@ -62826,6 +63612,7 @@ HG lv ac Ry +<<<<<<< HEAD fW fW fW @@ -62835,6 +63622,17 @@ dJ cg IJ Av +======= +TJ +Vx +Yx +Fr +IB +IB +Ec +IB +IB +>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining vc mm Dq diff --git a/maps/offmap_vr/talon/talon_v2_areas.dm b/maps/offmap_vr/talon/talon_v2_areas.dm index 654484f728..072e8a6ee7 100644 --- a/maps/offmap_vr/talon/talon_v2_areas.dm +++ b/maps/offmap_vr/talon/talon_v2_areas.dm @@ -106,6 +106,9 @@ /area/talon_v2/crew_quarters/sec_room name = "\improper Talon - Guard's Cabin" icon_state = "red" +/area/talon_v2/crew_quarters/mine_room + name = "\improper Talon - Miner's Cabin" + icon_state = "gray" /area/talon_v2/crew_quarters/cap_room name = "\improper Talon - Captain's Cabin" icon_state = "blue" diff --git a/maps/submaps/depreciated_vr/talon.dm b/maps/submaps/depreciated_vr/talon.dm index 968f26e5d2..f4a205c504 100644 --- a/maps/submaps/depreciated_vr/talon.dm +++ b/maps/submaps/depreciated_vr/talon.dm @@ -240,6 +240,12 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/space/void/pilot/talon name = "talon pilot's voidsuit" +/obj/item/clothing/head/helmet/space/void/mining/talon + name = "talon miner's voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) +/obj/item/clothing/suit/space/void/mining/talon + name = "talon miner's voidsuit" + /obj/item/device/gps/command/taloncap gps_tag = "TALC" /obj/item/device/gps/security/talonguard @@ -250,6 +256,8 @@ Once in open space, consider disabling nonessential power-consuming electronics gps_tag = "TALE" /obj/item/device/gps/explorer/talonpilot gps_tag = "TALP" +/obj/item/device/gps/mining/talonminer + gps_tag = "TALM" /obj/structure/closet/secure_closet/talon_captain name = "talon captain's locker" @@ -364,6 +372,29 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/device/gps/explorer/talonpilot ) +/obj/structure/closet/secure_closet/talon_miner + name = "talon miner's locker" + req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/miner + + starts_with = list( + /obj/item/device/radio/headset/talon, + /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, + /obj/item/clothing/suit/space/void/refurb/mining/talon, + /obj/item/weapon/tank/oxygen, + /obj/item/device/suit_cooling_unit, + /obj/item/device/gps/mining/talonminer, + /obj/item/clothing/gloves/black, + /obj/item/device/analyzer, + /obj/item/weapon/storage/bag/ore, + /obj/item/device/flashlight/lantern, + /obj/item/weapon/shovel, + /obj/item/weapon/pickaxe, + /obj/item/weapon/mining_scanner, + /obj/item/clothing/glasses/material, + /obj/item/clothing/glasses/meson + ) + /obj/machinery/vending/medical_talon //Not a subtype for *reasons* name = "NanoMed Plus" desc = "Medical drug dispenser." @@ -466,6 +497,13 @@ Once in open space, consider disabling nonessential power-consuming electronics hard_drive.store_file(new/datum/computer_file/program/camera_monitor/talon_helmet()) set_autorun("tsensormonitor") +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner + name = "miner's laptop" + +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner/install_default_programs() + ..() + hard_drive.store_file(new/datum/computer_file/program/ship_nav()) + //Generic modular consoles scattered around /obj/item/modular_computer/console/preset/talon name = "talon modular computer" diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index cea98781d9..d9024eecf9 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -132,6 +132,30 @@ /datum/alt_title/talon_security title = "Talon Security" +/datum/job/talon_miner + title = "Talon Miner" + flag = TALMIN + department_flag = TALON + job_description = "The miner's job is to excavate ores and refine them for the Talon's use, as well as for trading." + supervisors = "the ITV Talon's captain" + outfit_type = /decl/hierarchy/outfit/job/talon_miner + + offmap_spawn = TRUE + faction = "Station" //Required for SSjob to allow people to join as it + departments = list(DEPARTMENT_TALON) + total_positions = 1 + spawn_positions = 1 + selection_color = "#aaaaaa" + economic_modifier = 5 + minimal_player_age = 14 + pto_type = null + access = list(access_talon) + minimal_access = list(access_talon) + alt_titles = list("Talon Excavator" = /datum/alt_title/talon_excavator) + +/datum/alt_title/talon_excavator + title = "Talon Excavator" + //////////////////////TALON OUTFITS////////////////////// /decl/hierarchy/outfit/job/talon_captain @@ -234,3 +258,20 @@ satchel_one = /obj/item/weapon/storage/backpack/satchel/talon messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon +/decl/hierarchy/outfit/job/talon_miner + name = OUTFIT_JOB_NAME("Talon Miner") + hierarchy_type = /decl/hierarchy/outfit/job + + id_type = /obj/item/weapon/card/id/talon/miner + id_slot = slot_wear_id + pda_type = null + flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL + + l_ear = /obj/item/device/radio/headset/talon + shoes = /obj/item/clothing/shoes/boots/workboots + r_pocket = /obj/item/weapon/storage/bag/ore + l_pocket = /obj/item/weapon/tool/crowbar + uniform = /obj/item/clothing/under/rank/talon/basic + backpack = /obj/item/weapon/storage/backpack/talon + satchel_one = /obj/item/weapon/storage/backpack/satchel/talon + messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon \ No newline at end of file