Merge branch 'master' into upstream-merge-12168

code/datums/vending/stored_item.dm

@@ -42,6 +42,11 @@
 	var/atom/movable/product = instances[instances.len]	// Remove the last added product
 	instances -= product
 	product.forceMove(product_location)
+	//VOREStation Addition Start
+	if(istype(product, /obj))
+		var/obj/item = product
+		item.persist_storable = FALSE
+	//VOREStation Addition End
 	return product
 
 /datum/stored_item/proc/add_product(var/atom/movable/product)

code/game/jobs/jobs.dm

@@ -51,6 +51,19 @@ var/const/ASSISTANT			=(1<<11)
 var/const/BRIDGE			=(1<<12)
 var/const/ENTERTAINER		=(1<<13) //VOREStation Add
 
+/* // CHOMPedit: Comment out Talon positions, we don't have that here.
+//VOREStation Add
+var/const/TALON				=(1<<3)
+
+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
+*/
+
 var/list/assistant_occupations = list(
 )
 
@@ -147,7 +160,6 @@ var/list/whitelisted_positions = list(
 	"AI"
 )
 
-
 /proc/guest_jobbans(var/job)
 	return ((job in whitelisted_positions))
 

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

@@ -53,3 +53,9 @@
 	model_text = "Talon captain"
 	req_access = list(access_talon)
 	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/mecha/equipment/tools/storage_compartment.dm

@@ -0,0 +1,25 @@
+/obj/item/mecha_parts/mecha_equipment/storage
+    name = "auxillary exosuit storage bay"
+    desc = "An auxillary storage compartment, for attaching to exosuits."
+    icon_state = "mecha_tiler"
+    icon = 'icons/mecha/mecha_equipment_vr.dmi'
+    origin_tech = list(TECH_MATERIAL = 3)
+    range = 0
+    var/storage_added = 5
+    equip_type = EQUIP_SPECIAL
+
+/obj/item/mecha_parts/mecha_equipment/storage/attach(obj/mecha/M)
+    . = ..()
+    M.cargo_capacity += storage_added
+
+/obj/item/mecha_parts/mecha_equipment/storage/detach()
+    chassis.cargo_capacity -= storage_added
+    ..()
+
+/obj/item/mecha_parts/mecha_equipment/storage/bluespace
+    name = "auxillary exosuit storage wormhole"
+    desc = "An auxillary storage wormhole, utilizing a localized rip in bluespace for storage. Interestingly enough, teleport-stable, \
+    despite its blatant disregard for the fabric of reality or reality-adjacency."
+    icon_state = "mecha_phase_array"
+    storage_added = 15
+    origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3)

code/game/mecha/mecha.dm

@@ -2483,8 +2483,8 @@
 		var/obj/item/mecha_parts/mecha_equipment/equip = top_filter.getObj("select_equip")
 		if(equip)
 			src.selected = equip
-			src.occupant_message("You switch to [equip]")
-			src.visible_message("[src] raises [equip]")
+			src.occupant_message("You switch to [equip].")
+			src.visible_message("[src] raises [equip].")
 			send_byjax(src.occupant,"exosuit.browser","eq_list",src.get_equipment_list())
 		return
 	if(href_list["eject"])

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/paintkit.dm

@@ -259,6 +259,17 @@
 	new_desc = "A very retro APLU unit; didn't they retire these back in 2543?"
 	new_icon = "ripley-old"
 	allowed_types = list("ripley")
+	var/showpilot = TRUE
+	var/showpilot_lift = 5
+
+/obj/item/device/kit/paint/ripley/customize(obj/mecha/M, mob/user)
+	if(showpilot)
+		M.show_pilot = TRUE
+		M.pilot_lift = 5
+	else
+		M.show_pilot = FALSE
+		M.pilot_lift = 0
+	. = ..()
 
 /obj/item/device/kit/paint/ripley/death
 	name = "\"Reaper\" APLU customisation kit"
@@ -266,18 +277,21 @@
 	new_desc = "A terrifying, grim power loader. Why do those clamps have spikes?"
 	new_icon = "deathripley"
 	allowed_types = list("ripley","firefighter")
+	showpilot = FALSE
 
 /obj/item/device/kit/paint/ripley/flames_red
 	name = "\"Firestarter\" APLU customisation kit"
 	new_name = "APLU \"Firestarter\""
 	new_desc = "A standard APLU exosuit with stylish orange flame decals."
 	new_icon = "ripley_flames_red"
+	showpilot = FALSE
 
 /obj/item/device/kit/paint/ripley/flames_blue
 	name = "\"Burning Chrome\" APLU customisation kit"
 	new_name = "APLU \"Burning Chrome\""
 	new_desc = "A standard APLU exosuit with stylish blue flame decals."
 	new_icon = "ripley_flames_blue"
+	showpilot = FALSE
 
 // Durand kits.
 /obj/item/device/kit/paint/durand

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", "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","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //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","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
 
 /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", "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","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //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","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
 
 /datum/gear/accessory/white_drop_pouches
 	display_name = "drop pouches, white (Medical)"
@@ -83,7 +83,6 @@
 /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")
 	cost = 2
 
 /datum/gear/accessory/webbing

code/modules/client/stored_item.dm

@@ -134,6 +134,15 @@
 			to_chat(user, "<span class='warning'>You cannot store \the [O]. You already have something stored.</span>")
 			busy_bank = FALSE
 			return
+		var/choice = tgui_alert(user, "If you store \the [O], anything it contains may be lost to \the [src]. Are you sure?", "[src]", list("Store", "Cancel"), timeout = 10 SECONDS)
+		if(!choice || choice == "Cancel" || !Adjacent(user) || inoperable() || panel_open)
+			busy_bank = FALSE
+			return
+		for(var/obj/check in O.contents)
+			if(!check.persist_storable)
+				to_chat(user, "<span class='warning'>\The [src] buzzes. \The [O] contains [check], which cannot be stored. Please remove this item before attempting to store \the [O]. As a reminder, any contents of \the [O] will be lost if you store it with contents.</span>")
+				busy_bank = FALSE
+				return
 		user.visible_message("<span class='notice'>\The [user] begins storing \the [O] in \the [src].</span>","<span class='notice'>You begin storing \the [O] in \the [src].</span>")
 		icon_state = "item_bank_o"
 		if(!do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) || inoperable())
@@ -216,9 +225,6 @@
 /obj/item/weapon/gun/energy/sizegun/admin
 	persist_storable = FALSE
 /obj/item/weapon/gun/energy/sizegun/abductor
-<<<<<<< HEAD
-	persist_storable = FALSE
-=======
 	persist_storable = FALSE
 /obj/item/stack
 	persist_storable = FALSE
@@ -239,5 +245,4 @@
 /obj/item/seeds
 	persist_storable = FALSE
 /obj/item/weapon/reagent_containers/food/snacks/grown
-	persist_storable = FALSE
->>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun
+	persist_storable = FALSE

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)

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -243,7 +243,10 @@
 				return
 
 			remove_points(inserted_id, prize.cost)
-			new prize.equipment_path(loc)
+			//VOREStation Edit Start
+			var/obj/I = new prize.equipment_path(loc)
+			I.persist_storable = FALSE
+			//VOREStation Edit End
 			flick(icon_vend, src) //VOREStation Add
 		else
 			flick(icon_deny, src) //VOREStation Add

code/modules/mob/living/carbon/human/species/species.dm

@@ -57,7 +57,7 @@
 	var/taste_sensitivity = TASTE_NORMAL							// How sensitive the species is to minute tastes.
 	var/allergens = null									// Things that will make this species very sick
 	var/allergen_reaction = AG_TOX_DMG|AG_OXY_DMG|AG_EMOTE|AG_PAIN|AG_WEAKEN		// What type of reactions will you have? These the 'main' options and are intended to approximate anaphylactic shock at high doses.
-	var/allergen_damage_severity = 1.2							// How bad are reactions to the allergen? Touch with extreme caution.
+	var/allergen_damage_severity = 3.6							// How bad are reactions to the allergen? Touch with extreme caution.
 	var/allergen_disable_severity = 3							// Whilst this determines how long nonlethal effects last and how common emotes are.
 
 	var/min_age = 17

code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm

@@ -270,10 +270,17 @@
 
 /datum/trait/neutral/allergen_reduced_effect
 	name = "Reduced Allergen Reaction"
-	desc = "This trait halves the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)."
+	desc = "This trait drastically reduces the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)."
 	cost = 0
 	custom_only = FALSE
-	var_changes = list("allergen_damage_severity" = 0.6)
+	var_changes = list("allergen_damage_severity" = 1.2)
+
+/datum/trait/neutral/allergen_increased_effect
+	name = "Increased Allergen Reaction"
+	desc = "This trait drastically increases the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)."
+	cost = 0
+	custom_only = FALSE
+	var_changes = list("allergen_damage_severity" = 7.2)
 
 // Spicy Food Traits, from negative to positive.
 /datum/trait/neutral/spice_intolerance_extreme

code/modules/research/mechfab_designs.dm

@@ -770,6 +770,22 @@
 	materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/speedboost
 
+/datum/design/item/mecha/auxstorage
+	name = "Auxillary Exosuit Storage Bay"
+	desc = "An auxillary storage compartment, for attaching to exosuits."
+	id = "mech_storage"
+	req_tech = list(TECH_MATERIAL = 4)
+	materials = list(MAT_STEEL = 10000)
+	build_path = /obj/item/mecha_parts/mecha_equipment/storage
+
+/datum/design/item/mecha/bsauxstorage
+	name = "Auxillary Exosuit Storage Wormhole"
+	desc = "An auxillary storage wormhole, for attaching to exosuits."
+	id = "mech_storage_bs"
+	req_tech = list(TECH_MATERIAL = 4)
+	materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000)
+	build_path = /obj/item/mecha_parts/mecha_equipment/storage/bluespace
+
 /datum/design/item/synthetic_flash
 	name = "Synthetic Flash"
 	id = "sflash"

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"
 
@@ -355,6 +355,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
@@ -365,6 +371,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"
@@ -480,6 +488,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."
@@ -583,6 +614,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_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"
@@ -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"

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

vorestation.dme

@@ -1075,6 +1075,7 @@
 #include "code\game\mecha\equipment\tools\shield_omni.dm"
 #include "code\game\mecha\equipment\tools\sleeper.dm"
 #include "code\game\mecha\equipment\tools\speedboost.dm"
+#include "code\game\mecha\equipment\tools\storage_compartment.dm"
 #include "code\game\mecha\equipment\tools\syringe_gun.dm"
 #include "code\game\mecha\equipment\tools\teleporter.dm"
 #include "code\game\mecha\equipment\tools\tools.dm"