talon mining

code/game/jobs/jobs.dm

@@ -59,6 +59,7 @@ 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
 
 /proc/guest_jobbans(var/job)

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

code/game/machinery/suit_storage_unit_vr.dm

@@ -52,4 +52,10 @@
 	name = "Talon captain suit cycler"
 	model_text = "Talon captain"
 	req_access = list(access_talon)
-	departments = list(/datum/suit_cycler_choice/department/talon/officer)
+	departments = list(/datum/suit_cycler_choice/department/talon/officer)
+
+/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)

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"

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")

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",

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

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

code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm

@@ -58,11 +58,11 @@
 
 /datum/gear/accessory/brown_vest
 	display_name = "webbing, brown (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")
+	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")
+	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/white_vest
 	display_name = "webbing, white (Medical)"
@@ -70,11 +70,11 @@
 
 /datum/gear/accessory/brown_drop_pouches
 	display_name = "drop pouches, brown (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")
+	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")
+	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/white_drop_pouches
 	display_name = "drop pouches, white (Medical)"
@@ -83,7 +83,7 @@
 /datum/gear/accessory/bluespace
 	display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)"
 	path = /obj/item/clothing/accessory/storage/bluespace
-	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")
+	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")
 	cost = 2
 
 /datum/gear/accessory/webbing

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

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)

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"
 
@@ -349,6 +349,12 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 /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
@@ -359,6 +365,8 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 	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"
@@ -474,6 +482,29 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 		/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."
@@ -577,6 +608,13 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 	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"

maps/offmap_vr/talon/talon_v2.dmm

@@ -194,9 +194,11 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/workroom)
 "ax" = (
-/obj/machinery/mineral/unloading_machine,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/refining)
+/obj/machinery/camera/network/talon{
+	dir = 1
+	},
+/turf/simulated/floor/carpet,
+/area/talon_v2/crew_quarters/mine_room)
 "ay" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -1117,6 +1119,21 @@
 /obj/structure/handrail,
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/maintenance/wing_starboard)
+"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" = (
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/door/airlock/command{
@@ -2060,9 +2077,8 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
 "gd" = (
-/obj/effect/floor_decal/industrial/loading,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/refining)
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/mine_room)
 "ge" = (
 /obj/machinery/vending/coffee{
 	dir = 1
@@ -2434,6 +2450,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/eng_room)
 "hp" = (
@@ -2789,13 +2808,9 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
 "iq" = (
-/obj/machinery/mineral/input,
-/obj/machinery/conveyor{
-	dir = 4;
-	id = "talonrefinery"
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/refining)
+/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,
@@ -2829,6 +2844,11 @@
 /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,
@@ -3203,10 +3223,16 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/maintenance/fore_starboard)
 "jY" = (
-/obj/structure/ore_box,
+/obj/structure/closet/crate,
 /obj/structure/railing/grey,
 /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/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -3664,10 +3690,15 @@
 /turf/simulated/floor/reinforced/airless,
 /area/space)
 "lA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
 	},
+/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/refining)
 "lB" = (
@@ -4023,6 +4054,10 @@
 /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
@@ -4448,16 +4483,10 @@
 /turf/simulated/floor/tiled/white,
 /area/talon_v2/crew_quarters/bar)
 "ok" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "talonrefinery"
-	},
-/obj/machinery/mineral/output,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/refining)
+/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
@@ -4517,6 +4546,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/refining)
 "ot" = (
@@ -5195,11 +5229,9 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/ofd_ops)
 "qA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/wall/shull,
+/area/talon_v2/crew_quarters/mine_room)
 "qC" = (
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/door/airlock/engineeringatmos{
@@ -5307,10 +5339,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/central_hallway)
 "qQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/floor_decal/industrial/loading{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor,
+/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{
@@ -6198,6 +6236,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/ore_box,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/refining)
 "tK" = (
@@ -6693,6 +6732,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/refining)
 "vy" = (
@@ -7143,6 +7187,23 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/talonboat)
+"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)
@@ -7698,9 +7759,9 @@
 	},
 /area/talon_v2/engineering/port_store)
 "yU" = (
-/obj/machinery/mineral/mint,
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
+/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
@@ -7740,8 +7801,9 @@
 	name = "north bump";
 	pixel_y = 28
 	},
-/obj/structure/table/steel,
-/obj/item/weapon/storage/box/nifsofts_mining,
+/obj/structure/table/rack/steel,
+/obj/item/weapon/shovel,
+/obj/item/weapon/mining_scanner,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/refining)
 "zd" = (
@@ -8094,11 +8156,20 @@
 /turf/simulated/wall/rshull,
 /area/talon_v2/maintenance/wing_port)
 "Ax" = (
-/obj/structure/table/steel,
-/obj/item/weapon/storage/bag/ore,
-/obj/item/weapon/pickaxe/drill,
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
+/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,
@@ -8245,17 +8316,11 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/talonboat)
 "AY" = (
-/obj/structure/railing/grey{
-	dir = 4
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "talonrefinery"
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/structure/table/steel,
-/obj/item/stack/marker_beacon/thirty,
+/obj/machinery/mineral/output,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/refining)
 "AZ" = (
@@ -8538,15 +8603,12 @@
 /turf/simulated/floor/carpet/blucarpet,
 /area/talon_v2/crew_quarters/cap_room)
 "BZ" = (
-/obj/machinery/light/small,
-/obj/structure/railing/grey{
-	dir = 4
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/talon_v2/refining)
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/mine_room)
 "Cb" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -9040,6 +9102,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /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" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -9066,11 +9135,19 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/armory)
 "Ei" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/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/refining)
+/area/talon_v2/crew_quarters/mine_room)
 "Ej" = (
 /obj/structure/table/rack/steel,
 /turf/simulated/floor/plating,
@@ -9124,6 +9201,20 @@
 /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,
@@ -10639,10 +10730,10 @@
 	dir = 8;
 	pixel_x = -24
 	},
-/obj/structure/ore_box,
 /obj/structure/railing/grey{
 	dir = 1
 	},
+/obj/structure/closet/crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/refining)
 "Iu" = (
@@ -10693,6 +10784,9 @@
 /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{
 	dir = 1
@@ -10824,12 +10918,12 @@
 /obj/structure/sign/warning/moving_parts{
 	pixel_y = -32
 	},
-/obj/machinery/conveyor{
-	dir = 4;
-	id = "talonrefinery"
+/obj/machinery/disposal/wall{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/talon_v2/refining)
+/obj/structure/disposalpipe/trunk,
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/mine_room)
 "Jd" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/aux{
 	dir = 4
@@ -11053,14 +11147,13 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/maintenance/wing_port)
 "JK" = (
-/obj/structure/railing/grey{
-	dir = 4
+/obj/structure/table/woodentable,
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
+/turf/simulated/floor/carpet,
+/area/talon_v2/crew_quarters/mine_room)
 "JL" = (
 /turf/simulated/wall/shull,
 /area/talon_v2/ofd_ops)
@@ -11259,6 +11352,15 @@
 	},
 /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;
@@ -11794,6 +11896,10 @@
 /obj/machinery/alarm/talon{
 	pixel_y = 28
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/eng_room)
 "LT" = (
@@ -11905,6 +12011,12 @@
 	},
 /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{
@@ -12962,18 +13074,18 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/port)
 "PA" = (
-/obj/structure/railing/grey{
-	dir = 4
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/table/steel,
-/obj/machinery/recharger,
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/refining)
 "PB" = (
 /obj/structure/table/rack/shelf/steel,
@@ -13713,6 +13825,15 @@
 /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
@@ -14241,14 +14362,12 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/atmospherics)
 "TH" = (
-/obj/structure/closet/crate,
-/obj/structure/railing/grey,
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
 	pixel_x = -30
 	},
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
+/turf/simulated/wall/shull,
+/area/talon_v2/crew_quarters/mine_room)
 "TJ" = (
 /obj/machinery/mineral/stacking_unit_console{
 	pixel_y = -6;
@@ -14272,7 +14391,7 @@
 "TL" = (
 /obj/machinery/suit_cycler/vintage/tpilot,
 /obj/machinery/button/remote/airlock{
-	id = "talon_pilotdoor";
+	id = "talon_minerdoor";
 	name = "Door Bolts";
 	pixel_y = 28;
 	specialfunctions = 4
@@ -14439,13 +14558,10 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/maintenance/wing_starboard)
 "Um" = (
-/obj/structure/closet/crate,
-/obj/structure/railing/grey{
-	dir = 1
-	},
 /obj/machinery/camera/network/talon{
 	dir = 4
 	},
+/obj/machinery/mineral/mint,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/refining)
 "Un" = (
@@ -15168,13 +15284,13 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
 /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" = (
@@ -15701,9 +15817,12 @@
 	dir = 8
 	},
 /obj/structure/table/rack/steel,
-/obj/item/weapon/shovel,
-/obj/item/weapon/shovel,
-/obj/item/weapon/mining_scanner,
+/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)
 "Yo" = (
@@ -15715,16 +15834,11 @@
 /turf/simulated/floor/plating,
 /area/talon_v2/maintenance/fore_starboard)
 "Yp" = (
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
-	dir = 4
+/obj/structure/bed/chair/bay/chair{
+	dir = 1
 	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/talon_v2/refining)
+/turf/simulated/floor/carpet,
+/area/talon_v2/crew_quarters/mine_room)
 "Yq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -16165,8 +16279,11 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/talonboat)
 "ZA" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/mineral/input,
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "talonrefinery"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/talon_v2/refining)
 "ZB" = (
@@ -27468,9 +27585,9 @@ Ym
 Um
 TH
 Ax
-Ax
+Eu
 yU
-WJ
+IB
 Wz
 Vr
 iN
@@ -27606,13 +27723,13 @@ Og
 vx
 or
 or
-or
+PA
 lA
 Ei
-VS
-VS
+RY
+jZ
 BZ
-WJ
+IB
 hk
 mr
 Ll
@@ -27748,13 +27865,13 @@ fW
 gR
 Yc
 VS
-Yc
+de
 qQ
 qA
-VS
+wY
 gd
 IY
-WJ
+Mk
 LR
 Jf
 Tg
@@ -27890,13 +28007,13 @@ fW
 PK
 tJ
 VS
-Yc
-qQ
-qA
-Yc
 YL
+mL
+IB
+Kw
+df
 iq
-WJ
+IB
 nD
 et
 pv
@@ -28032,13 +28149,13 @@ fW
 Hg
 tJ
 VS
-Yc
+YL
 AY
-PA
+IB
 JK
 Yp
 ax
-WJ
+IB
 zA
 pS
 Xh
@@ -28176,11 +28293,11 @@ TE
 VS
 YL
 ZA
-TZ
-dJ
-TZ
+IB
+ix
+di
 ok
-fW
+IB
 DD
 DD
 DD
@@ -28318,11 +28435,11 @@ TJ
 Vx
 Yx
 Fr
-fW
-fW
-fW
-fW
-fW
+IB
+IB
+Ec
+IB
+IB
 vc
 ps
 Xw

maps/offmap_vr/talon/talon_v2_areas.dm

@@ -112,6 +112,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"

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"
@@ -365,6 +373,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."
@@ -468,6 +499,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"

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
@@ -233,3 +257,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