updates

_maps/map_files/cyberiad/cyberiad.dmm

@@ -61303,6 +61303,7 @@
 	},
 /area/shuttle/mining)
 "cgG" = (
+/obj/structure/closet/wardrobe/miner,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -65238,7 +65239,7 @@
 /turf/simulated/wall,
 /area/toxins/test_area)
 "cnl" = (
-/obj/structure/closet/wardrobe/miner,
+/obj/structure/closet/wardrobe/miner/lavaland,
 /turf/simulated/floor/plasteel{
 	dir = 2;
 	icon_state = "brown"

code/game/jobs/job/support.dm

@@ -175,21 +175,23 @@
 	name = "Shaft Miner"
 	jobtype = /datum/job/mining
 
-	uniform = /obj/item/clothing/under/rank/miner
-	gloves = /obj/item/clothing/gloves/fingerless
-	shoes = /obj/item/clothing/shoes/workboots
+	uniform = /obj/item/clothing/under/rank/miner/lavaland
+	gloves = /obj/item/clothing/gloves/color/black
+	shoes = /obj/item/clothing/shoes/workboots/mining
 	l_ear = /obj/item/radio/headset/headset_cargo/mining
 	id = /obj/item/card/id/supply
-	l_pocket = /obj/item/reagent_containers/food/pill/patch/styptic
+	l_pocket = /obj/item/reagent_containers/hypospray/autoinjector/survival
 	r_pocket = /obj/item/flashlight/seclite
 	pda = /obj/item/pda/shaftminer
 	backpack_contents = list(
 		/obj/item/mining_voucher = 1,
-		/obj/item/storage/bag/ore = 1
+		/obj/item/storage/bag/ore = 1,
+		/obj/item/survivalcapsule = 1,
+		/obj/item/stack/marker_beacon/ten = 1
 	)
 
-	backpack = /obj/item/storage/backpack/industrial
-	satchel = /obj/item/storage/backpack/satchel_eng
+	backpack = /obj/item/storage/backpack/explorer
+	satchel = /obj/item/storage/backpack/explorer
 
 
 

code/game/machinery/suit_storage_unit.dm

@@ -115,6 +115,12 @@
 /obj/machinery/suit_storage_unit/mining/secure
 	secure = TRUE
 
+/obj/machinery/suit_storage_unit/lavaland
+	name = "mining suit storage unit"
+	suit_type = /obj/item/clothing/suit/hooded/explorer
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	req_access = list(access_mining_station)
+
 /obj/machinery/suit_storage_unit/cmo
 	suit_type    = /obj/item/clothing/suit/space/hardsuit/medical
 	helmet_type  = /obj/item/clothing/head/helmet/space/hardsuit/medical

code/game/mecha/working/ripley.dm

@@ -21,7 +21,7 @@
 
 /obj/mecha/working/ripley/Destroy()
 	while(damage_absorption["brute"] < 0.6)
-		new /obj/item/asteroid/goliath_hide(loc)
+		new /obj/item/stack/sheet/animalhide/goliath_hide(loc)
 		damage_absorption["brute"] = damage_absorption["brute"] + 0.1 //If a goliath-plated ripley gets killed, all the plates drop
 	for(var/atom/movable/A in cargo)
 		A.forceMove(loc)

code/game/objects/items/stacks/sheets/leather.dm

@@ -126,6 +126,40 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER
 
+/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
+	if(proximity_flag)
+		if(istype(target, /obj/item/clothing/suit/space/hardsuit/mining) || istype(target, /obj/item/clothing/head/helmet/space/hardsuit/mining) || istype(target, /obj/item/clothing/suit/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/suit/hooded/explorer) || istype(target, /obj/item/clothing/head/hooded/explorer))
+			var/obj/item/clothing/C = target
+			var/current_armor = C.armor
+			if(current_armor["melee"] < 60)
+				current_armor["melee"] = min(current_armor["melee"] + 10, 60)
+				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
+				qdel(src)
+			else
+				to_chat(user, "<span class='info'>You can't improve [C] any further.</span>")
+				return
+		if(istype(target, /obj/mecha/working/ripley))
+			var/obj/mecha/D = target
+			if(D.icon_state != "ripley-open")
+				to_chat(user, "<span class='info'>You can't add armour onto the mech while someone is inside!</span>")
+				return
+			var/list/damage_absorption = D.damage_absorption
+			if(damage_absorption["brute"] > 0.3)
+				damage_absorption["brute"] = max(damage_absorption["brute"] - 0.1, 0.3)
+				damage_absorption["bullet"] = damage_absorption["bullet"] - 0.05
+				damage_absorption["fire"] = damage_absorption["fire"] - 0.05
+				damage_absorption["laser"] = damage_absorption["laser"] - 0.025
+				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
+				qdel(src)
+				D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open")
+				D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
+				if(damage_absorption["brute"] == 0.3)
+					D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
+					D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
+			else
+				to_chat(user, "<span class='warning'>You can't improve [D] any further!</span>")
+				return
+
 /obj/item/stack/sheet/animalhide/ashdrake
 	name = "ash drake hide"
 	desc = "The strong, scaled hide of an ash drake."

code/game/objects/items/weapons/storage/backpack.dm

@@ -157,6 +157,12 @@
 	item_state = "engiepack"
 	burn_state = FIRE_PROOF
 
+/obj/item/storage/backpack/explorer
+	name = "explorer bag"
+	desc = "A robust backpack for stashing your loot."
+	icon_state = "explorerpack"
+	item_state = "explorerpack"
+
 /obj/item/storage/backpack/botany
 	name = "botany backpack"
 	desc = "It's a backpack made of all-natural fibers."
@@ -234,6 +240,12 @@
 	icon_state = "satchel-eng"
 	burn_state = FIRE_PROOF
 
+/obj/item/storage/backpack/satchel/explorer
+	name = "explorer satchel"
+	desc = "A robust satchel for stashing your loot."
+	icon_state = "satchel-explorer"
+	item_state = "securitypack"
+
 /obj/item/storage/backpack/satchel_med
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."

code/game/objects/items/weapons/storage/boxes.dm

@@ -1082,6 +1082,15 @@
 		new /obj/item/stock_parts/micro_laser/quadultra(src)
 		new /obj/item/stock_parts/matter_bin/bluespace(src)
 
+/obj/item/storage/box/mininghardsuit
+	name = "Boxed Mining Hardsuit"
+	desc = "Contains a mining hardsuit and helmet. For mining."
+
+/obj/item/storage/box/mininghardsuit/New()
+	..()
+	new /obj/item/clothing/suit/space/hardsuit/mining(src)
+	new /obj/item/clothing/head/helmet/space/hardsuit/mining(src)
+
 /obj/item/storage/box/hug
 	name = "box of hugs"
 	desc = "A special box for sensitive people."

code/modules/clothing/masks/gasmask.dm

@@ -62,6 +62,24 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
 
+/obj/item/clothing/mask/gas/explorer
+	name = "explorer gas mask"
+	desc = "A military-grade gas mask that can be connected to an air supply."
+	icon_state = "gas_mining"
+	actions_types = list(/datum/action/item_action/adjust)
+	resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/mask/gas/explorer/attack_self(mob/user)
+	adjustmask(user)
+
+/obj/item/clothing/mask/gas/explorer/adjustmask(user)
+	..()
+	w_class = mask_adjusted ? WEIGHT_CLASS_SMALL : WEIGHT_CLASS_NORMAL
+
+/obj/item/clothing/mask/gas/explorer/folded/Initialize()
+	. = ..()
+	adjustmask()
+
 //Bane gas mask
 /obj/item/clothing/mask/banemask
 	name = "bane mask"

code/modules/clothing/suits/armor.dm

@@ -502,6 +502,8 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF
+	flags = BLOCKHAIR
+	flags_cover = HEADCOVERSEYES
 
 /obj/item/clothing/suit/hooded/goliath
 	name = "goliath cloak"

code/modules/mining/equipment_locker.dm

@@ -452,6 +452,7 @@
 		new /datum/data/mining_equipment("Shelter Capsule",					/obj/item/survivalcapsule,											400),
 		new /datum/data/mining_equipment("Luxury Shelter Capsule",			/obj/item/survivalcapsule/luxury,	    							3000),
 		new /datum/data/mining_equipment("Jump Boots",						/obj/item/clothing/shoes/bhop,        								2500),
+		new /datum/data/mining_equipment("Mining Hardsuit",					/obj/item/storage/box/mininghardsuit,								2000),
 		new /datum/data/mining_equipment("1 Marker Beacon",					/obj/item/stack/marker_beacon,										10),
 		new /datum/data/mining_equipment("10 Marker Beacons",				/obj/item/stack/marker_beacon/ten,									100),
 		new /datum/data/mining_equipment("30 Marker Beacons",				/obj/item/stack/marker_beacon/thirty,								300),

code/modules/mining/explorer_gear.dm

@@ -0,0 +1,28 @@
+/****************Explorer's Suit and Mask****************/
+/obj/item/clothing/suit/hooded/explorer
+	name = "explorer suit"
+	desc = "An armoured suit for exploring harsh environments."
+	icon_state = "explorer"
+	item_state = "explorer"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	hoodtype = /obj/item/clothing/head/hooded/explorer
+	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
+	allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+	resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/head/hooded/explorer
+	name = "explorer hood"
+	desc = "An armoured hood for exploring harsh environments."
+	icon_state = "explorer"
+	item_state = "explorer"
+	body_parts_covered = HEAD
+	flags = BLOCKHAIR
+	flags_cover = HEADCOVERSEYES
+	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
+	resistance_flags = FIRE_PROOF

code/modules/mining/mine_items.dm

@@ -32,6 +32,21 @@
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 
+/obj/structure/closet/wardrobe/miner/lavaland
+
+/obj/structure/closet/wardrobe/miner/lavaland/New()
+	..()
+	contents = list()
+	new /obj/item/storage/backpack/duffel(src)
+	new /obj/item/storage/backpack/explorer(src)
+	new /obj/item/storage/backpack/explorer(src)
+	new /obj/item/clothing/under/rank/miner/lavaland(src)
+	new /obj/item/clothing/under/rank/miner/lavaland(src)
+	new /obj/item/clothing/under/rank/miner/lavaland(src)
+	new /obj/item/clothing/shoes/workboots/mining(src)
+	new /obj/item/clothing/shoes/workboots/mining(src)
+	new /obj/item/clothing/shoes/workboots/mining(src)
+
 /obj/structure/closet/secure_closet/miner
 	name = "miner's equipment"
 	icon_state = "miningsec1"
@@ -50,6 +65,8 @@
 	new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
 	new /obj/item/storage/bag/ore(src)
 	new /obj/item/clothing/glasses/meson(src)
+	new /obj/item/survivalcapsule(src)
+	new /obj/item/stack/marker_beacon/ten
 
 /**********************Shuttle Computer**************************/
 

code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

@@ -31,6 +31,7 @@ Difficulty: Medium
 	armour_penetration = 50
 	melee_damage_lower = 25
 	melee_damage_upper = 25
+	wander = 0
 	speed = 2
 	ranged = 1
 	del_on_death = 1

code/modules/mob/living/simple_animal/hostile/mining/goliath.dm

@@ -33,7 +33,7 @@
 	pull_force = MOVE_FORCE_VERY_STRONG
 	var/pre_attack = 0
 	var/pre_attack_icon = "Goliath_preattack"
-	loot = list(/obj/item/asteroid/goliath_hide{layer = 4.1})
+	loot = list(/obj/item/stack/sheet/animalhide/goliath_hide{layer = 4.1})
 
 /mob/living/simple_animal/hostile/asteroid/goliath/process_ai()
 	..()
@@ -135,49 +135,6 @@
 	deltimer(timerid)
 	timerid = QDEL_IN(src, 7)
 
-/obj/item/asteroid/goliath_hide
-	name = "goliath hide plates"
-	desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "goliath_hide"
-	flags = NOBLUDGEON
-	w_class = WEIGHT_CLASS_NORMAL
-	layer = 4
-
-/obj/item/asteroid/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
-	if(proximity_flag)
-		if(istype(target, /obj/item/clothing/suit/space/hardsuit/mining) || istype(target, /obj/item/clothing/head/helmet/space/hardsuit/mining) || istype(target, /obj/item/clothing/suit/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman/miner))
-			var/obj/item/clothing/C = target
-			var/current_armor = C.armor
-			if(current_armor["melee"] < 60)
-				current_armor["melee"] = min(current_armor["melee"] + 10, 60)
-				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
-				qdel(src)
-			else
-				to_chat(user, "<span class='info'>You can't improve [C] any further.</span>")
-				return
-		if(istype(target, /obj/mecha/working/ripley))
-			var/obj/mecha/D = target
-			if(D.icon_state != "ripley-open")
-				to_chat(user, "<span class='info'>You can't add armour onto the mech while someone is inside!</span>")
-				return
-			var/list/damage_absorption = D.damage_absorption
-			if(damage_absorption["brute"] > 0.3)
-				damage_absorption["brute"] = max(damage_absorption["brute"] - 0.1, 0.3)
-				damage_absorption["bullet"] = damage_absorption["bullet"] - 0.05
-				damage_absorption["fire"] = damage_absorption["fire"] - 0.05
-				damage_absorption["laser"] = damage_absorption["laser"] - 0.025
-				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
-				qdel(src)
-				D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open")
-				D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
-				if(damage_absorption["brute"] == 0.3)
-					D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
-					D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
-			else
-				to_chat(user, "<span class='warning'>You can't improve [D] any further!</span>")
-				return
-
 /mob/living/simple_animal/hostile/asteroid/goliath/beast
 	name = "goliath"
 	desc = "A hulking, armor-plated beast with long tendrils arching from its back."