12/21 modernizations from TG live (#103)

* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes

code/modules/mining/abandoned_crates.dm

@@ -4,19 +4,21 @@
 	name = "abandoned crate"
 	desc = "What could be inside?"
 	icon_state = "securecrate"
+	integrity_failure = 0 //no breaking open the crate
 	var/code = null
 	var/lastattempt = null
 	var/attempts = 10
 	var/codelen = 4
+	tamperproof = 90
 
 /obj/structure/closet/crate/secure/loot/New()
 	..()
-	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "z")
+	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
 	code = ""
 	for(var/i = 0, i < codelen, i++)
 		var/dig = pick(digits)
 		code += dig
-		digits -= dig  //Player can enter codes with matching digits, but there are never matching digits in the answer
+		digits -= dig  //there are never matching digits in the answer
 
 	var/loot = rand(1,100) //100 different crates with varying chances of spawning
 	switch(loot)
@@ -45,7 +47,7 @@
 			for(var/i in 1 to 3)
 				new /obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
 		if(31 to 35)
-			new /obj/item/seeds/cash(src)
+			new /obj/item/seeds/firelemon(src)
 		if(36 to 40)
 			new /obj/item/weapon/melee/baton(src)
 		if(41 to 45)
@@ -54,7 +56,7 @@
 		if(46 to 50)
 			new /obj/item/clothing/under/chameleon(src)
 			for(var/i in 1 to 7)
-				new /obj/item/clothing/tie/horrible(src)
+				new /obj/item/clothing/neck/tie/horrible(src)
 		if(51 to 52) // 2% chance
 			new /obj/item/weapon/melee/classic_baton(src)
 		if(53 to 54)
@@ -65,13 +67,13 @@
 		if(57 to 58)
 			new /obj/item/toy/syndicateballoon(src)
 		if(59 to 60)
-			new /obj/item/weapon/gun/energy/kinetic_accelerator/hyper(src)
+			new /obj/item/borg/upgrade/modkit/aoe/mobs(src)
 			new /obj/item/clothing/suit/space(src)
 			new /obj/item/clothing/head/helmet/space(src)
 		if(61 to 62)
 			for(var/i in 1 to 5)
 				new /obj/item/clothing/head/kitty(src)
-				new /obj/item/clothing/tie/petcollar(src)
+				new /obj/item/clothing/neck/petcollar(src)
 		if(63 to 64)
 			for(var/i in 1 to rand(4, 7))
 				var/newcoin = pick(/obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/diamond, /obj/item/weapon/coin/plasma, /obj/item/weapon/coin/uranium)
@@ -140,7 +142,7 @@
 			new /obj/item/weapon/hand_tele(src)
 		if(97)
 			new /obj/item/clothing/mask/balaclava
-			new /obj/item/weapon/gun/projectile/automatic/pistol(src)
+			new /obj/item/weapon/gun/ballistic/automatic/pistol(src)
 			new /obj/item/ammo_box/magazine/m10mm(src)
 		if(98)
 			new /obj/item/weapon/katana/cursed(src)
@@ -153,27 +155,32 @@
 /obj/structure/closet/crate/secure/loot/attack_hand(mob/user)
 	if(locked)
 		user << "<span class='notice'>The crate is locked with a Deca-code lock.</span>"
-		var/input = input(usr, "Enter [codelen] digits.", "Deca-Code Lock", "") as text
+		var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text
 		if(user.canUseTopic(src, 1))
+			var/list/sanitised = list()
+			var/sanitycheck = 1
+			for(var/i=1,i<=length(input),i++) //put the guess into a list
+				sanitised += text2num(copytext(input,i,i+1))
+			for(var/i=1,i<=(length(input)-1),i++) //compare each digit in the guess to all those following it
+				for(var/j=(i+1),j<=length(input),j++)
+					if(sanitised[i] == sanitised[j])
+						sanitycheck = null //if a digit is repeated, reject the input
 			if (input == code)
 				user << "<span class='notice'>The crate unlocks!</span>"
 				locked = 0
 				cut_overlays()
 				add_overlay("securecrateg")
-			else if (input == null || length(input) != codelen)
+			else if (input == null || sanitycheck == null || length(input) != codelen)
 				user << "<span class='notice'>You leave the crate alone.</span>"
 			else
 				user << "<span class='warning'>A red light flashes.</span>"
-				lastattempt = replacetext(input, 0, "z")
+				lastattempt = input
 				attempts--
 				if(attempts == 0)
 					boom(user)
 	else
 		return ..()
 
-/obj/structure/closet/crate/secure/loot/attack_animal(mob/user)
-	boom(user)
-
 /obj/structure/closet/crate/secure/loot/AltClick(mob/living/user)
 	if(!user.canUseTopic(src))
 		return
@@ -192,19 +199,21 @@
 				user << "<span class='notice'>* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.</span>"
 			if(lastattempt != null)
 				var/list/guess = list()
+				var/list/answer = list()
 				var/bulls = 0
 				var/cows = 0
-				for(var/i = 1, i < codelen + 1, i++)
-					var/a = copytext(lastattempt, i, i+1) //Stuff the code into the list
-					guess += a
-					guess[a] = i
-				for(var/i in guess) //Go through list and count matches
-					var/a = findtext(code, i)
-					if(a == guess[i])
-						++bulls
-					else if(a)
+				for(var/i=1,i<=length(lastattempt),i++)
+					guess += text2num(copytext(lastattempt,i,i+1))
+				for(var/i=1,i<=length(lastattempt),i++)
+					answer += text2num(copytext(code,i,i+1))
+				for(var/i = 1, i < codelen + 1, i++) // Go through list and count matches
+					if( answer.Find(guess[i],1,codelen+1))
 						++cows
-				user << "<span class='notice'>Last code attempt had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.</span>"
+					if( answer[i] == guess[i])
+						++bulls
+						--cows
+
+				user << "<span class='notice'>Last code attempt, [lastattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.</span>"
 			return
 	return ..()
 
@@ -214,10 +223,5 @@
 	else
 		..()
 
-/obj/structure/closet/crate/secure/loot/proc/boom(mob/user)
-	user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
-	for(var/atom/movable/AM in src)
-		qdel(AM)
-	var/turf/T = get_turf(src)
-	explosion(T, -1, -1, 1, 1)
-	qdel(src)
+/obj/structure/closet/crate/secure/loot/deconstruct(disassembled = TRUE)
+	boom()

code/modules/mining/equipment.dm

@@ -12,8 +12,9 @@
 	heat_protection = CHEST|GROIN|LEGS|ARMS
 	hooded = 1
 	hoodtype = /obj/item/clothing/head/explorer
-	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50, fire = 50, acid = 50)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals, /obj/item/weapon/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/weapon/gun/energy/kinetic_accelerator, /obj/item/weapon/pickaxe)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/clothing/head/explorer
 	name = "explorer hood"
@@ -24,7 +25,8 @@
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
 	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)
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50, fire = 50, acid = 50)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/clothing/mask/gas/explorer
 	name = "explorer gas mask"
@@ -34,14 +36,15 @@
 	visor_flags_inv = HIDEFACIALHAIR
 	visor_flags_cover = MASKCOVERSMOUTH
 	actions_types = list(/datum/action/item_action/adjust)
-	armor = list(melee = 10, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 50, rad = 0)
+	armor = list(melee = 10, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 50, rad = 0, fire = 20, acid = 40)
+	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 ? 3 : 2
+	w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL
 
 /obj/item/clothing/mask/gas/explorer/folded/New()
 	..()
@@ -59,7 +62,7 @@
 	icon_state = "Jaunter"
 	item_state = "electronic"
 	throwforce = 0
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 5
 	origin_tech = "bluespace=2"
@@ -81,7 +84,7 @@
 	var/list/destinations = list()
 
 	if(isgolem(user))
-		for(var/obj/item/device/radio/beacon/B in world)
+		for(var/obj/item/device/radio/beacon/B in teleportbeacons)
 			var/turf/T = get_turf(B)
 			if(istype(T.loc, /area/ruin/powered/golem_ship))
 				destinations += B
@@ -90,7 +93,7 @@
 	if(destinations.len)
 		return destinations
 
-	for(var/obj/item/device/radio/beacon/B in world)
+	for(var/obj/item/device/radio/beacon/B in teleportbeacons)
 		var/turf/T = get_turf(B)
 		if(T.z == ZLEVEL_STATION)
 			destinations += B
@@ -164,13 +167,13 @@
 	icon_state = "resonator"
 	item_state = "resonator"
 	desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vacuum."
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	force = 15
 	throwforce = 10
-	var/cooldown = 0
-	var/fieldsactive = 0
 	var/burst_time = 30
 	var/fieldlimit = 4
+	var/list/fields = list()
+	var/quick_burst_mod = 0.8
 	origin_tech = "magnets=3;engineering=3"
 
 /obj/item/weapon/resonator/upgraded
@@ -180,17 +183,19 @@
 	item_state = "resonator_u"
 	origin_tech = "materials=4;powerstorage=3;engineering=3;magnets=3"
 	fieldlimit = 6
+	quick_burst_mod = 1
 
 /obj/item/weapon/resonator/proc/CreateResonance(target, creator)
 	var/turf/T = get_turf(target)
-	if(locate(/obj/effect/resonance) in T)
+	var/obj/effect/resonance/R = locate(/obj/effect/resonance) in T
+	if(R)
+		R.resonance_damage *= quick_burst_mod
+		R.burst(T)
 		return
-	if(fieldsactive < fieldlimit)
+	if(fields.len < fieldlimit)
 		playsound(src,'sound/weapons/resonator_fire.ogg',50,1)
-		new /obj/effect/resonance(T, creator, burst_time)
-		fieldsactive++
-		spawn(burst_time)
-			fieldsactive--
+		var/obj/effect/resonance/RE = new /obj/effect/resonance(T, creator, burst_time, src)
+		fields += RE
 
 /obj/item/weapon/resonator/attack_self(mob/user)
 	if(burst_time == 50)
@@ -202,7 +207,9 @@
 
 /obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag)
 	if(proximity_flag)
-		if(!check_allowed_items(target, 1)) return
+		if(!check_allowed_items(target, 1))
+			return
+		user.changeNext_move(CLICK_CD_MELEE)
 		CreateResonance(target, user)
 
 /obj/effect/resonance
@@ -211,37 +218,42 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "shield1"
 	layer = ABOVE_ALL_MOB_LAYER
+	anchored = TRUE
 	mouse_opacity = 0
 	var/resonance_damage = 20
+	var/creator
+	var/obj/item/weapon/resonator/res
 
-/obj/effect/resonance/New(loc, var/creator = null, var/timetoburst)
+/obj/effect/resonance/New(loc, set_creator, timetoburst, set_resonator)
+	..()
+	creator = set_creator
+	res = set_resonator
 	var/turf/proj_turf = get_turf(src)
 	if(!istype(proj_turf))
 		return
-	if(istype(proj_turf, /turf/closed/mineral))
-		var/turf/closed/mineral/M = proj_turf
-		spawn(timetoburst)
-			playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
-			M.gets_drilled(creator)
-			qdel(src)
-	else
-		var/datum/gas_mixture/environment = proj_turf.return_air()
-		var/pressure = environment.return_pressure()
-		if(pressure < 50)
-			name = "strong resonance field"
-			resonance_damage = 60
-		spawn(timetoburst)
-			playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
-			if(creator)
-				for(var/mob/living/L in src.loc)
-					add_logs(creator, L, "used a resonator field on", "resonator")
-					L << "<span class='danger'>The [src.name] ruptured with you in it!</span>"
-					L.adjustBruteLoss(resonance_damage)
-			else
-				for(var/mob/living/L in src.loc)
-					L << "<span class='danger'>The [src.name] ruptured with you in it!</span>"
-					L.adjustBruteLoss(resonance_damage)
-			qdel(src)
+	var/datum/gas_mixture/environment = proj_turf.return_air()
+	var/pressure = environment.return_pressure()
+	if(pressure < 50)
+		name = "strong resonance field"
+		resonance_damage = 60
+	addtimer(src, "burst", timetoburst, TIMER_NORMAL, proj_turf)
+
+/obj/effect/resonance/Destroy()
+	if(res)
+		res.fields -= src
+	return ..()
+
+/obj/effect/resonance/proc/burst(turf/T)
+	playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
+	if(ismineralturf(T))
+		var/turf/closed/mineral/M = T
+		M.gets_drilled(creator)
+	for(var/mob/living/L in T)
+		if(creator)
+			add_logs(creator, L, "used a resonator field on", "resonator")
+		L << "<span class='danger'>The [src.name] ruptured with you in it!</span>"
+		L.apply_damage(resonance_damage, BRUTE)
+	qdel(src)
 
 /**********************Facehugger toy**********************/
 
@@ -265,7 +277,7 @@
 	icon_state = "lazarus_hypo"
 	item_state = "hypo"
 	throwforce = 0
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 5
 	var/loaded = 1
@@ -276,7 +288,7 @@
 /obj/item/weapon/lazarus_injector/afterattack(atom/target, mob/user, proximity_flag)
 	if(!loaded)
 		return
-	if(istype(target, /mob/living) && proximity_flag)
+	if(isliving(target) && proximity_flag)
 		if(istype(target, /mob/living/simple_animal))
 			var/mob/living/simple_animal/M = target
 			if(M.sentience_type != revive_type)
@@ -285,7 +297,7 @@
 			if(M.stat == DEAD)
 				M.faction = list("neutral")
 				M.revive(full_heal = 1, admin_revive = 1)
-				if(istype(target, /mob/living/simple_animal/hostile))
+				if(ishostile(target))
 					var/mob/living/simple_animal/hostile/H = M
 					if(malfunctioning)
 						H.faction |= list("lazarus", "\ref[user]")
@@ -326,7 +338,7 @@
 	name = "manual mining scanner"
 	icon_state = "mining1"
 	item_state = "analyzer"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/cooldown = 0
@@ -358,7 +370,7 @@
 	name = "advanced automatic mining scanner"
 	icon_state = "mining0"
 	item_state = "analyzer"
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/cooldown = 35
@@ -408,6 +420,7 @@
 				for(var/turf/closed/mineral/M in minerals)
 					var/turf/F = get_turf(M)
 					var/image/I = image('icons/turf/smoothrocks.dmi', loc = F, icon_state = M.scan_state, layer = FLASH_LAYER)
+					I.plane = FULLSCREEN_PLANE
 					C.images += I
 					spawn(30)
 						if(C)
@@ -441,28 +454,6 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "xeno_warning"
 
-/******************Hardsuit Jetpack Upgrade*******************/
-/obj/item/hardsuit_jetpack
-	name = "hardsuit jetpack upgrade"
-	icon_state = "jetpack_upgrade"
-	desc = "A modular, compact set of thrusters designed to integrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment."
-	origin_tech = "materials=4;magnets=4;engineering=5"
-	// Same as jetpack implant minus biotech, makes sense.
-
-
-/obj/item/hardsuit_jetpack/afterattack(var/obj/item/clothing/suit/space/hardsuit/S, mob/user)
-	..()
-	if(!istype(S))
-		user << "<span class='warning'>This upgrade can only be applied to a hardsuit.</span>"
-	else if(S.jetpack)
-		user << "<span class='warning'>[S] already has a jetpack installed.</span>"
-	else if(S == user.get_item_by_slot(slot_wear_suit)) //Make sure the player is not wearing the suit before applying the upgrade.
-		user << "<span class='warning'>You cannot install the upgrade to [S] while wearing it.</span>"
-	else
-		S.jetpack = new /obj/item/weapon/tank/jetpack/suit(S)
-		user << "<span class='notice'>You successfully install the jetpack into [S].</span>"
-		qdel(src)
-
 /*********************Hivelord stabilizer****************/
 
 /obj/item/weapon/hivelordstabilizer
@@ -470,7 +461,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle19"
 	desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "biotech=3"
 
 /obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user)
@@ -489,12 +480,12 @@
 	icon_state = "mining_hammer1"
 	item_state = "mining_hammer1"
 	name = "proto-kinetic crusher"
-	desc = "An early design of the proto-kinetic accelerator, it is little more than an combination of various mining tools cobbled together, forming a high-tech club.\
-	  While it is an effective mining tool, it did little to aid any but the most skilled and/or suicidal miners against local fauna. \
-	 \n<span class='info'>Mark a mob with the destabilizing force, then hit them in melee to activate it for extra damage. Extra damage if backstabbed in this fashion. \
-	 This weapon is only particularly effective against large creatures.</span>"
+	desc = "An early design of the proto-kinetic accelerator, it is little more than an combination of various mining tools cobbled together, forming a high-tech club. \
+	While it is an effective mining tool, it did little to aid any but the most skilled and/or suicidal miners against local fauna.\
+	\n<span class='info'>Mark a mob with the destabilizing force, then hit them in melee to activate it for extra damage. Extra damage if backstabbed in this fashion. \
+	This weapon is only particularly effective against large creatures.</span>"
 	force = 20 //As much as a bone spear, but this is significantly more annoying to carry around due to requiring the use of both hands at all times
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	force_unwielded = 20 //It's never not wielded so these are the same
 	force_wielded = 20
@@ -504,16 +495,13 @@
 	armour_penetration = 10
 	materials = list(MAT_METAL=1150, MAT_GLASS=2075)
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("smashes", "crushes", "cleaves", "chops", "pulps")
+	attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped")
 	sharpness = IS_SHARP
 	var/charged = 1
 	var/charge_time = 16
 	var/atom/mark = null
 	var/marked_image = null
 
-/obj/item/weapon/twohanded/required/mining_hammer/New()
-	set_light(luminosity)
-
 /obj/item/projectile/destabilizer
 	name = "destabilizing force"
 	icon_state = "pulse1"
@@ -522,8 +510,9 @@
 	flag = "bomb"
 	range = 6
 	var/obj/item/weapon/twohanded/required/mining_hammer/hammer_synced =  null
+	log_override = TRUE
 
-/obj/item/projectile/destabilizer/on_hit(atom/target, blocked = 0, hit_zone)
+/obj/item/projectile/destabilizer/on_hit(atom/target, blocked = 0)
 	if(hammer_synced)
 		if(hammer_synced.mark == target)
 			return ..()
@@ -538,7 +527,7 @@
 				L.underlays += I
 				hammer_synced.marked_image = I
 		var/target_turf = get_turf(target)
-		if(istype(target_turf, /turf/closed/mineral))
+		if(ismineralturf(target_turf))
 			var/turf/closed/mineral/M = target_turf
 			PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, M)
 			M.gets_drilled(firer)
@@ -547,7 +536,7 @@
 /obj/item/weapon/twohanded/required/mining_hammer/afterattack(atom/target, mob/user, proximity_flag)
 	if(!proximity_flag && charged)//Mark a target, or mine a tile.
 		var/turf/proj_turf = get_turf(src)
-		if(!istype(proj_turf, /turf))
+		if(!isturf(proj_turf))
 			return
 		var/datum/gas_mixture/environment = proj_turf.return_air()
 		var/pressure = environment.return_pressure()
@@ -584,3 +573,11 @@
 		charged = 1
 		icon_state = "mining_hammer1"
 		playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
+
+/obj/item/weapon/twohanded/required/mining_hammer/pickup(mob/user)
+	..()
+	user.AddLuminosity(luminosity)
+
+/obj/item/weapon/twohanded/required/mining_hammer/dropped(mob/user)
+	..()
+	user.AddLuminosity(-luminosity)

code/modules/mining/fulton.dm

@@ -1,18 +1,17 @@
 var/list/total_extraction_beacons = list()
 
 /obj/item/weapon/extraction_pack
-	name = "fulton material extraction pack"
-	desc = "A balloon that can be used to extract people or objects to a Fulton Recovery Beacon. Anything not bolted down can be moved. Link the pack to a beacon by using the pack in hand."
+	name = "fulton extraction pack"
+	desc = "A balloon that can be used to extract equipment or personnel to a Fulton Recovery Beacon. Anything not bolted down can be moved. Link the pack to a beacon by using the pack in hand."
 	icon = 'icons/obj/fulton.dmi'
 	icon_state = "extraction_pack"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	var/obj/structure/extraction_point/beacon
 	var/list/beacon_networks = list("station")
 	var/uses_left = 3
 	var/can_use_indoors
 	var/safe_for_living_creatures = 1
 
-
 /obj/item/weapon/extraction_pack/examine()
 	. = ..()
 	usr.show_message("It has [uses_left] uses remaining.", 1)
@@ -54,13 +53,17 @@ var/list/total_extraction_beacons = list()
 		if(!safe_for_living_creatures && check_for_living_mobs(A))
 			user << "[src] is not safe for use with living creatures, they wouldn't survive the trip back!"
 			return
-		if(A.loc == user || A == user) // no extracting stuff you're holding in your hands/yourself
+		if(A.loc == user) // no extracting stuff you're holding
 			return
 		if(A.anchored)
 			return
 		user << "<span class='notice'>You start attaching the pack to [A]...</span>"
 		if(do_after(user,50,target=A))
 			user << "<span class='notice'>You attach the pack to [A] and activate it.</span>"
+			if(loc == user || istype(user.back, /obj/item/weapon/storage/backpack))
+				var/obj/item/weapon/storage/backpack/B = user.back
+				if(B.can_be_inserted(src,stop_messages = 1))
+					B.handle_item_insertion(src)
 			uses_left--
 			if(uses_left <= 0)
 				user.drop_item(src)
@@ -68,7 +71,7 @@ var/list/total_extraction_beacons = list()
 			var/image/balloon
 			var/image/balloon2
 			var/image/balloon3
-			if(istype(A, /mob/living))
+			if(isliving(A))
 				var/mob/living/M = A
 				M.Weaken(16) // Keep them from moving during the duration of the extraction
 				M.buckled = 0 // Unbuckle them to prevent anchoring problems
@@ -101,7 +104,7 @@ var/list/total_extraction_beacons = list()
 			sleep(10)
 			playsound(holder_obj.loc, 'sound/items/fultext_launch.wav', 50, 1, -3)
 			animate(holder_obj, pixel_z = 1000, time = 30)
-			if(istype(A, /mob/living/carbon/human))
+			if(ishuman(A))
 				var/mob/living/carbon/human/L = A
 				L.SetParalysis(0)
 				L.drowsyness = 0
@@ -136,16 +139,14 @@ var/list/total_extraction_beacons = list()
 
 /obj/item/fulton_core
 	name = "extraction beacon signaller"
-	desc = "Emits a signal which fulton recovery devices can lock on to. Craft with metal to create a beacon."
+	desc = "Emits a signal which fulton recovery devices can lock on to. Activate in hand to create a beacon."
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "subspace_amplifier"
 
-/datum/crafting_recipe/fulton
-	name = "Fulton Recovery Beacon"
-	result = /obj/structure/extraction_point
-	reqs = list(/obj/item/fulton_core = 1, /obj/item/stack/sheet/metal = 5)
-	time = 15
-	category = CAT_MISC
+/obj/item/fulton_core/attack_self(mob/user)
+	if(do_after(user,15,target = user) && !qdeleted(src))
+		new /obj/structure/extraction_point(get_turf(user))
+		qdel(src)
 
 /obj/structure/extraction_point
 	name = "fulton recovery beacon"
@@ -172,12 +173,12 @@ var/list/total_extraction_beacons = list()
 	var/atom/movable/stored_obj
 
 /obj/item/weapon/extraction_pack/proc/check_for_living_mobs(atom/A)
-	if(istype(A, /mob/living))
+	if(isliving(A))
 		var/mob/living/L = A
 		if(L.stat != DEAD)
 			return 1
 	for(var/thing in A.GetAllContents())
-		if(istype(A, /mob/living))
+		if(isliving(A))
 			var/mob/living/L = A
 			if(L.stat != DEAD)
 				return 1

code/modules/mining/laborcamp/laborshuttle.dm

@@ -5,7 +5,6 @@
 	shuttleId = "laborcamp"
 	possible_destinations = "laborcamp_home;laborcamp_away"
 	req_access = list(access_brig)
-	light_color = LIGHT_COLOR_CYAN
 
 
 /obj/machinery/computer/shuttle/labor/one_way
@@ -25,4 +24,4 @@
 		if(S && S.name == "laborcamp_away")
 			usr << "<span class='warning'>Shuttle is already at the outpost!</span>"
 			return 0
-	..()
+	..()

code/modules/mining/laborcamp/laborstacker.dm

@@ -74,14 +74,14 @@
 	switch(action)
 		if("handle_id")
 			if(inserted_id)
-				if(!usr.get_active_hand())
+				if(!usr.get_active_held_item())
 					usr.put_in_hands(inserted_id)
 					inserted_id = null
 				else
 					inserted_id.forceMove(get_turf(src))
 					inserted_id = null
 			else
-				var/obj/item/I = usr.get_active_hand()
+				var/obj/item/I = usr.get_active_held_item()
 				if(istype(I, /obj/item/weapon/card/id/prisoner))
 					if(!usr.drop_item())
 						return

code/modules/mining/lavaland/ash_flora.dm

@@ -0,0 +1,218 @@
+/obj/structure/flora/ash
+	gender = PLURAL
+	layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot
+	icon = 'icons/obj/lavaland/ash_flora.dmi'
+	icon_state = "l_mushroom"
+	name = "large mushrooms"
+	desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores."
+	var/harvested_name = "shortened mushrooms"
+	var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large."
+	var/needs_sharp_harvest = TRUE
+	var/harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings
+	var/harvest_amount_low = 1
+	var/harvest_amount_high = 3
+	var/harvest_time = 60
+	var/harvest_message_low = "You pick a mushroom, but fail to collect many shavings from its cap."
+	var/harvest_message_med = "You pick a mushroom, carefully collecting the shavings from its cap."
+	var/harvest_message_high = "You harvest and collect shavings from several mushroom caps."
+	var/harvested = FALSE
+	var/base_icon
+	var/regrowth_time_low = 4800
+	var/regrowth_time_high = 8400
+
+/obj/structure/flora/ash/New()
+	..()
+	base_icon = "[icon_state][rand(1, 4)]"
+	icon_state = base_icon
+	if(prob(15))
+		harvest(null, TRUE)
+
+/obj/structure/flora/ash/proc/harvest(user, no_drop)
+	if(harvested)
+		return 0
+	if(!no_drop)
+		var/rand_harvested = rand(harvest_amount_low, harvest_amount_high)
+		if(rand_harvested)
+			if(user)
+				var/msg = harvest_message_med
+				if(rand_harvested == harvest_amount_low)
+					msg = harvest_message_low
+				else if(rand_harvested == harvest_amount_high)
+					msg = harvest_message_high
+				user << "<span class='notice'>[msg]</span>"
+			for(var/i in 1 to rand_harvested)
+				new harvest(get_turf(src))
+	icon_state = "[base_icon]p"
+	name = harvested_name
+	desc = harvested_desc
+	harvested = TRUE
+	addtimer(src, "regrow", rand(regrowth_time_low, regrowth_time_high))
+	return 1
+
+/obj/structure/flora/ash/proc/regrow()
+	icon_state = base_icon
+	name = initial(name)
+	desc = initial(desc)
+	harvested = FALSE
+
+/obj/structure/flora/ash/attackby(obj/item/weapon/W, mob/user, params)
+	if(!harvested && needs_sharp_harvest && W.sharpness)
+		user.visible_message("<span class='notice'>[user] starts to harvest from [src] with [W].</span>","<span class='notice'>You begin to harvest from [src] with [W].</span>")
+		if(do_after(user, harvest_time, target = src))
+			harvest(user)
+	else
+		return ..()
+
+/obj/structure/flora/ash/attack_hand(mob/user)
+	if(!harvested && !needs_sharp_harvest)
+		user.visible_message("<span class='notice'>[user] starts to harvest from [src].</span>","<span class='notice'>You begin to harvest from [src].</span>")
+		if(do_after(user, harvest_time, target = src))
+			harvest(user)
+	else
+		..()
+
+/obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things
+	regrowth_time_low = 4200
+
+/obj/structure/flora/ash/leaf_shroom
+	icon_state = "s_mushroom"
+	name = "leafy mushrooms"
+	desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
+	harvested_name = "leafless mushrooms"
+	harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
+	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf
+	needs_sharp_harvest = FALSE
+	harvest_amount_high = 4
+	harvest_time = 20
+	harvest_message_low = "You pluck a single, suitable leaf."
+	harvest_message_med = "You pluck a number of leaves, leaving a few unsuitable ones."
+	harvest_message_high = "You pluck quite a lot of suitable leaves."
+	regrowth_time_low = 2400
+	regrowth_time_high = 6000
+
+/obj/structure/flora/ash/cap_shroom
+	icon_state = "r_mushroom"
+	name = "tall mushrooms"
+	desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
+	harvested_name = "small mushrooms"
+	harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
+	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap
+	harvest_amount_high = 4
+	harvest_time = 50
+	harvest_message_low = "You slice the cap off of a mushroom."
+	harvest_message_med = "You slice off a few conks from the larger mushrooms."
+	harvest_message_high = "You slice off a number of caps and conks from these mushrooms."
+	regrowth_time_low = 3000
+	regrowth_time_high = 5400
+
+/obj/structure/flora/ash/stem_shroom
+	icon_state = "t_mushroom"
+	name = "numerous mushrooms"
+	desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!"
+	luminosity = 1
+	harvested_name = "tiny mushrooms"
+	harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
+	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
+	harvest_amount_high = 4
+	harvest_time = 40
+	harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem."
+	harvest_message_med = "You pick and decapitate several mushrooms for their stems."
+	harvest_message_high = "You acquire a number of stems from these mushrooms."
+	regrowth_time_low = 3000
+	regrowth_time_high = 6000
+
+/obj/structure/flora/ash/cacti
+	icon_state = "cactus"
+	name = "fruiting cacti"
+	desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
+	harvested_name = "cacti"
+	harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
+	harvest = /obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit
+	needs_sharp_harvest = FALSE
+	harvest_amount_high = 2
+	harvest_time = 10
+	harvest_message_low = "You pick a cactus fruit."
+	harvest_message_med = "You pick several cactus fruit." //shouldn't show up, because you can't get more than two
+	harvest_message_high = "You pick a pair of cactus fruit."
+	regrowth_time_low = 4800
+	regrowth_time_high = 7200
+
+/obj/structure/flora/ash/cacti/Crossed(mob/AM)
+	if(ishuman(AM) && has_gravity(loc) && prob(70))
+		var/mob/living/carbon/human/H = AM
+		if(!H.shoes && !H.lying) //ouch, my feet.
+			var/picked_def_zone = pick("l_leg", "r_leg")
+			var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
+			if(!istype(O) || (PIERCEIMMUNE in H.dna.species.species_traits))
+				return
+			H.apply_damage(rand(3, 6), BRUTE, picked_def_zone)
+			H.Weaken(2)
+			H.visible_message("<span class='danger'>[H] steps on a cactus!</span>", \
+				"<span class='userdanger'>You step on a cactus!</span>")
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora
+	name = "mushroom shavings"
+	desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
+	icon = 'icons/obj/lavaland/ash_flora.dmi'
+	icon_state = "mushroom_shavings"
+	list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
+	w_class = WEIGHT_CLASS_TINY
+	resistance_flags = FLAMMABLE
+	obj_integrity = 100
+	max_integrity = 100
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora/New()
+	..()
+	pixel_x = rand(-4, 4)
+	pixel_y = rand(-4, 4)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting
+
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf
+	name = "mushroom leaf"
+	desc = "A leaf, from a mushroom."
+	list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
+	icon_state = "mushroom_leaf"
+
+
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap
+	name = "mushroom cap"
+	desc = "The cap of a large mushroom."
+	list_reagents = list("mindbreaker" = 2, "entpoly" = 4, "mushroomhallucinogen" = 2)
+	icon_state = "mushroom_cap"
+
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem
+	name = "mushroom stem"
+	desc = "A long mushroom stem. It's slightly glowing."
+	list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
+	icon_state = "mushroom_stem"
+	luminosity = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit
+	name = "cactus fruit"
+	list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 4)
+	desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
+	icon_state = "cactus_fruit"
+
+
+/obj/item/mushroom_bowl
+	name = "mushroom bowl"
+	desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
+	icon = 'icons/obj/lavaland/ash_flora.dmi'
+	icon_state = "mushroom_bowl"
+	w_class = WEIGHT_CLASS_SMALL
+	resistance_flags = FLAMMABLE
+	obj_integrity = 200
+	max_integrity = 200
+
+//what you can craft with these things
+/datum/crafting_recipe/mushroom_bowl
+	name = "Mushroom Bowl"
+	result = /obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl
+	reqs = list(/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings = 5)
+	time = 30
+	category = CAT_PRIMAL

code/modules/mining/lavaland/necropolis_chests.dm

@@ -4,7 +4,7 @@
 	name = "necropolis chest"
 	desc = "It's watching you closely."
 	icon_state = "necrocrate"
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/structure/closet/crate/necropolis/tendril
 	desc = "It's watching you suspiciously."
@@ -48,7 +48,7 @@
 		if(16)
 			new /obj/item/weapon/guardiancreator(src)
 		if(17)
-			new /obj/item/stack/sheet/runed_metal/fifty(src)
+			new /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs(src)
 		if(18)
 			new /obj/item/device/warp_cube/red(src)
 		if(19)
@@ -83,24 +83,21 @@
 		user << "<span class='warning'>The wisp has gone missing!</span>"
 		return
 	if(wisp.loc == src)
-		user << "<span class='notice'>You release the wisp. It begins to \
-			bob around your head.</span>"
+		user << "<span class='notice'>You release the wisp. It begins to bob around your head.</span>"
 		user.sight |= SEE_MOBS
 		icon_state = "lantern"
 		wisp.orbit(user, 20)
 		feedback_add_details("wisp_lantern","F") // freed
 
 	else
-		user << "<span class='notice'>You return the wisp to the lantern.\
-			</span>"
+		user << "<span class='notice'>You return the wisp to the lantern.</span>"
 
 		if(wisp.orbiting)
-			var/atom/A = wisp.orbiting
-			if(istype(A, /mob/living))
+			var/atom/A = wisp.orbiting.orbiting
+			if(isliving(A))
 				var/mob/living/M = A
 				M.sight &= ~SEE_MOBS
-				M << "<span class='notice'>Your vision returns to \
-					normal.</span>"
+				M << "<span class='notice'>Your vision returns to normal.</span>"
 
 		wisp.stop_orbit()
 		wisp.loc = src
@@ -116,8 +113,7 @@
 		if(wisp.loc == src)
 			qdel(wisp)
 		else
-			wisp.visible_message("<span class='notice'>[wisp] has a sad \
-				feeling for a moment, then it passes.</span>")
+			wisp.visible_message("<span class='notice'>[wisp] has a sad feeling for a moment, then it passes.</span>")
 	..()
 
 //Wisp Lantern
@@ -193,19 +189,23 @@
 	weaken = 3
 	var/chain
 
-/obj/item/ammo_casing/magic/hook/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
+/obj/item/projectile/hook/fire(setAngle)
+	if(firer)
+		chain = firer.Beam(src, icon_state = "chain", time = INFINITY, maxdistance = INFINITY)
 	..()
-	var/obj/item/projectile/hook/P = BB
-	spawn(1)
-		P.chain = P.Beam(user,icon_state="chain",icon = 'icons/obj/lavaland/artefacts.dmi',time=1000, maxdistance = 30)
 
 /obj/item/projectile/hook/on_hit(atom/target)
 	. = ..()
 	if(isliving(target))
 		var/mob/living/L = target
-		L.visible_message("<span class='danger'>[L] is snagged by [firer]'s hook!</span>")
-		L.forceMove(get_turf(firer))
-		qdel(chain)
+		if(!L.anchored)
+			L.visible_message("<span class='danger'>[L] is snagged by [firer]'s hook!</span>")
+			L.forceMove(get_turf(firer))
+
+/obj/item/projectile/hook/Destroy()
+	qdel(chain)
+	return ..()
+
 
 //Immortality Talisman
 /obj/item/device/immortality_talisman
@@ -213,8 +213,12 @@
 	desc = "A dread talisman that can render you completely invulnerable."
 	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "talisman"
+	actions_types = list(/datum/action/item_action/immortality)
 	var/cooldown = 0
 
+/datum/action/item_action/immortality
+	name = "Immortality"
+
 /obj/item/device/immortality_talisman/Destroy(force)
 	if(force)
 		. = ..()
@@ -225,7 +229,7 @@
 	if(cooldown < world.time)
 		feedback_add_details("immortality_talisman","U") // usage
 		cooldown = world.time + 600
-		user.visible_message("<span class='danger'>[user] vanishes from reality, leaving a a hole in their place!</span>")
+		user.visible_message("<span class='danger'>[user] vanishes from reality, leaving a a hole in [user.p_their()] place!</span>")
 		var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc))
 		Z.name = "hole in reality"
 		Z.desc = "It's shaped an awful lot like [user.name]."
@@ -244,7 +248,6 @@
 /obj/effect/immortality_talisman
 	icon_state = "blank"
 	icon = 'icons/effects/effects.dmi'
-	burn_state = LAVA_PROOF
 	var/can_destroy = FALSE
 
 /obj/effect/immortality_talisman/attackby()
@@ -271,7 +274,7 @@
 	name = "paradox bag"
 	desc = "Somehow, it's in two places at once."
 	max_combined_w_class = 60
-	max_w_class = 3
+	max_w_class = WEIGHT_CLASS_NORMAL
 
 
 //External
@@ -334,11 +337,7 @@
 				var/obj/screen/inventory/hand/H = over_object
 				if(!M.unEquip(src))
 					return
-				switch(H.slot_id)
-					if(slot_r_hand)
-						M.put_in_r_hand(src)
-					if(slot_l_hand)
-						M.put_in_l_hand(src)
+				M.put_in_hand(src, H.held_index)
 
 			add_fingerprint(usr)
 
@@ -351,7 +350,7 @@
 	icon_state = "goliath_boat"
 	icon = 'icons/obj/lavaland/dragonboat.dmi'
 	keytype = /obj/item/weapon/oar
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
 
 /obj/vehicle/lavaboat/relaymove(mob/user, direction)
 	var/turf/next = get_step(src, direction)
@@ -370,8 +369,8 @@
 	item_state = "rods"
 	desc = "Not to be confused with the kind Research hassles you for."
 	force = 12
-	w_class = 3
-	burn_state = LAVA_PROOF
+	w_class = WEIGHT_CLASS_NORMAL
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
 
 /datum/crafting_recipe/oar
 	name = "goliath bone oar"
@@ -470,7 +469,7 @@
 		if(2)
 			new /obj/item/weapon/lava_staff(src)
 		if(3)
-			new /obj/item/weapon/spellbook/oneuse/fireball(src)
+			new /obj/item/weapon/spellbook/oneuse/sacredflame(src)
 			new /obj/item/weapon/gun/magic/wand/fireball(src)
 		if(4)
 			new /obj/item/weapon/dragons_blood(src)
@@ -482,7 +481,7 @@
 	item_state = "spectral"
 	flags = CONDUCT
 	sharpness = IS_SHARP
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	force = 1
 	throwforce = 1
 	hitsound = 'sound/effects/ghost2.ogg'
@@ -510,7 +509,7 @@
 		return
 	user << "You call out for aid, attempting to summon spirits to your side."
 
-	notify_ghosts("[user] is raising their [src], calling for your help!",
+	notify_ghosts("[user] is raising [user.p_their()] [src], calling for your help!",
 		enter_link="<a href=?src=\ref[src];orbit=1>(Click to help)</a>",
 		source = user, action=NOTIFY_ORBIT)
 
@@ -530,8 +529,16 @@
 	var/turf/T = get_turf(src)
 	var/list/contents = T.GetAllContents()
 	var/mob/dead/observer/current_spirits = list()
-	for(var/mob/dead/observer/G in dead_mob_list)
-		if(G.orbiting in contents)
+	var/list/orbiters = list()
+	for(var/thing in contents)
+		var/atom/A = thing
+		if (A.orbiters)
+			orbiters += A.orbiters
+
+	for(var/thing in orbiters)
+		var/datum/orbit/O = thing
+		if (isobserver(O.orbiter))
+			var/mob/dead/observer/G = O.orbiter
 			ghost_counter++
 			G.invisibility = 0
 			current_spirits |= G
@@ -574,14 +581,18 @@
 
 	switch(random)
 		if(1)
-			user << "<span class='danger'>Other than tasting terrible, nothing really happens.</span>"
+			user << "<span class='danger'>Your appearence morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.</span>"
+			H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "snout" = "Sharp", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs")
+			H.eye_color = "fee5a3"
+			H.set_species(/datum/species/lizard)
 		if(2)
 			user << "<span class='danger'>Your flesh begins to melt! Miraculously, you seem fine otherwise.</span>"
 			H.set_species(/datum/species/skeleton)
 		if(3)
-			user << "<span class='danger'>You don't feel so good...</span>"
-			message_admins("[key_name_admin(user)](<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) has started transforming into a dragon via dragon's blood.")
-			H.ForceContractDisease(new /datum/disease/transformation/dragon(0))
+			user << "<span class='danger'>Power courses through you! You can now shift your form at will."
+			if(user.mind)
+				var/obj/effect/proc_holder/spell/targeted/shapeshift/dragon/D = new
+				user.mind.AddSpell(D)
 		if(4)
 			user << "<span class='danger'>You feel like you could walk straight through lava now.</span>"
 			H.weather_immunities |= "lava"
@@ -615,14 +626,18 @@
 	item_state = "staffofstorms"
 	icon = 'icons/obj/guns/magic.dmi'
 	slot_flags = SLOT_BACK
-	item_state = "staffofstorms"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	force = 25
 	damtype = BURN
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	hitsound = 'sound/weapons/sear.ogg'
 	var/turf_type = /turf/open/floor/plating/lava/smooth
-	var/cooldown = 200
+	var/transform_string = "lava"
+	var/reset_turf_type = /turf/open/floor/plating/asteroid/basalt
+	var/reset_string = "basalt"
+	var/create_cooldown = 100
+	var/create_delay = 30
+	var/reset_cooldown = 50
 	var/timer = 0
 	var/banned_turfs
 
@@ -639,15 +654,36 @@
 		return
 
 	if(target in view(user.client.view, get_turf(user)))
-		var/turf/T = get_turf(target)
-		message_admins("[key_name_admin(user)] fired the lava staff at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[get_area(target)] ([T.x], [T.y], [T.z])</a>).")
-		log_game("[key_name(user)] fired the lava staff at [get_area(target)] ([T.x], [T.y], [T.z]).")
 
-		var/turf/open/O = target
-		user.visible_message("<span class='danger'>[user] turns \the [O] into lava!</span>")
-		O.ChangeTurf(turf_type)
-		playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1)
-		timer = world.time + cooldown
+		var/turf/open/T = get_turf(target)
+		if(!istype(T))
+			return
+		if(!istype(T, turf_type))
+			var/obj/effect/overlay/temp/lavastaff/L = PoolOrNew(/obj/effect/overlay/temp/lavastaff, T)
+			L.alpha = 0
+			animate(L, alpha = 255, time = create_delay)
+			user.visible_message("<span class='danger'>[user] points [src] at [T]!</span>")
+			timer = world.time + create_delay + 1
+			if(do_after(user, create_delay, target = T))
+				user.visible_message("<span class='danger'>[user] turns \the [T] into [transform_string]!</span>")
+				message_admins("[key_name_admin(user)] fired the lava staff at [get_area(target)]. [ADMIN_COORDJMP(T)]")
+				log_game("[key_name(user)] fired the lava staff at [get_area(target)] [COORD(T)].")
+				T.ChangeTurf(turf_type)
+				timer = world.time + create_cooldown
+				qdel(L)
+			else
+				timer = world.time
+				qdel(L)
+				return
+		else
+			user.visible_message("<span class='danger'>[user] turns \the [T] into [reset_string]!</span>")
+			T.ChangeTurf(reset_turf_type)
+			timer = world.time + reset_cooldown
+		playsound(T,'sound/magic/Fireball.ogg', 200, 1)
+
+/obj/effect/overlay/temp/lavastaff
+	icon_state = "lavastaff_warn"
+	duration = 50
 
 ///Bubblegum
 
@@ -674,11 +710,11 @@
 	var/loot = rand(1,3)
 	switch(loot)
 		if(1)
-			new /obj/item/weapon/antag_spawner/slaughter_demon(src)
-		if(2)
 			new /obj/item/mayhem(src)
-		if(3)
+		if(2)
 			new /obj/item/blood_contract(src)
+		if(3)
+			new /obj/item/weapon/gun/magic/staff/spellblade(src)
 
 /obj/item/blood_contract
 	name = "blood contract"
@@ -692,7 +728,7 @@
 	if(used)
 		return
 	used = TRUE
-	var/choice = input(user,"Who do you want dead?","Pick Reinforcement") as null|anything in player_list
+	var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in player_list
 
 	if(!(isliving(choice)))
 		user << "[choice] is already dead!"
@@ -708,7 +744,7 @@
 		survive.owner = L.mind
 		L.mind.objectives += survive
 		L << "<span class='userdanger'>You've been marked for death! Don't let the demons get you!</span>"
-		L.color = "#FF0000"
+		L.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
 		spawn()
 			var/obj/effect/mine/pickup/bloodbath/B = new(L)
 			B.mineEffect(L)
@@ -716,7 +752,193 @@
 		for(var/mob/living/carbon/human/H in player_list)
 			if(H == L)
 				continue
-			H << "<span class='userdanger'>You have an overwhelming desire to kill [L]. They have been marked red! Go kill them!</span>"
-			H.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife/butcher(H), slot_l_hand)
+			H << "<span class='userdanger'>You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Go kill [L.p_them()]!</span>"
+			H.put_in_hands_or_del(new /obj/item/weapon/kitchen/knife/butcher(H))
 
 	qdel(src)
+
+//Hierophant
+
+/obj/item/weapon/hierophant_staff
+	name = "Hierophant's staff"
+	desc = "A large club with intense magic power infused into it."
+	icon_state = "hierophant_staff"
+	item_state = "hierophant_staff"
+	icon = 'icons/obj/guns/magic.dmi'
+	slot_flags = SLOT_BACK
+	w_class = WEIGHT_CLASS_BULKY
+	force = 20
+	hitsound = "swing_hit"
+	//hitsound = 'sound/weapons/sonic_jackhammer.ogg'
+	actions_types = list(/datum/action/item_action/vortex_recall, /datum/action/item_action/toggle_unfriendly_fire)
+	var/cooldown_time = 20 //how long the cooldown between non-melee ranged attacks is
+	var/chaser_cooldown = 101 //how long the cooldown between firing chasers at mobs is
+	var/chaser_timer = 0 //what our current chaser cooldown is
+	var/timer = 0 //what our current cooldown is
+	var/blast_range = 3 //how long the cardinal blast's walls are
+	var/obj/effect/hierophant/rune //the associated rune we teleport to
+	var/teleporting = FALSE //if we ARE teleporting
+	var/friendly_fire_check = FALSE //if the blasts we make will consider our faction against the faction of hit targets
+
+/obj/item/weapon/hierophant_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	..()
+	var/turf/T = get_turf(target)
+	if(!T || timer > world.time)
+		return
+	timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown
+	if(proximity_flag)
+		addtimer(src, "aoe_burst", 0, TIMER_NORMAL, T, user)
+		add_logs(user, target, "fired 3x3 blast at", src)
+	else
+		if(ismineralturf(target) && get_dist(user, target) < 6) //target is minerals, we can hit it(even if we can't see it)
+			addtimer(src, "cardinal_blasts", 0, TIMER_NORMAL, T, user)
+			timer = world.time + cooldown_time
+		else if(target in view(5, get_turf(user))) //if the target is in view, hit it
+			timer = world.time + cooldown_time
+			if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
+				chaser_timer = world.time + chaser_cooldown
+				PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(get_turf(user), user, target, 1.5, friendly_fire_check))
+				add_logs(user, target, "fired a chaser at", src)
+			else
+				addtimer(src, "cardinal_blasts", 0, TIMER_NORMAL, T, user) //otherwise, just do cardinal blast
+				add_logs(user, target, "fired cardinal blast at", src)
+		else
+			user << "<span class='warning'>That target is out of range!</span>" //too far away
+
+/obj/item/weapon/hierophant_staff/ui_action_click(mob/user, action)
+	if(istype(action, /datum/action/item_action/toggle_unfriendly_fire)) //toggle friendly fire...
+		friendly_fire_check = !friendly_fire_check
+		user << "<span class='warning'>You toggle friendly fire [friendly_fire_check ? "off":"on"]!</span>"
+		return
+	if(!user.is_holding(src)) //you need to hold the staff to teleport
+		user << "<span class='warning'>You need to hold the staff in your hands to [rune ? "teleport with it":"create a rune"]!</span>"
+		return
+	if(!rune)
+		if(isturf(user.loc))
+			user.visible_message("<span class='hierophant_warning'>[user] holds [src] carefully in front of [user.p_them()], moving it in a strange pattern...</span>", \
+			"<span class='notice'>You start creating a hierophant rune to teleport to...</span>")
+			timer = world.time + 51
+			if(do_after(user, 50, target = user))
+				var/turf/T = get_turf(user)
+				playsound(T,'sound/magic/Blind.ogg', 200, 1, -4)
+				PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, user))
+				var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
+				rune = H
+				user.update_action_buttons_icon()
+				user.visible_message("<span class='hierophant_warning'>[user] creates a strange rune beneath [user.p_them()]!</span>", \
+				"<span class='hierophant'>You create a hierophant rune, which you can teleport yourself and any allies to at any time!</span>\n\
+				<span class='notice'>You can remove the rune to place a new one by striking it with the staff.</span>")
+			else
+				timer = world.time
+		else
+			user << "<span class='warning'>You need to be on solid ground to produce a rune!</span>"
+		return
+	if(get_dist(user, rune) <= 2) //rune too close abort
+		user << "<span class='warning'>You are too close to the rune to teleport to it!</span>"
+		return
+	if(is_blocked_turf(get_turf(rune)))
+		user << "<span class='warning'>The rune is blocked by something, preventing teleportation!</span>"
+		return
+	teleporting = TRUE //start channel
+	user.update_action_buttons_icon()
+	user.visible_message("<span class='hierophant_warning'>[user] starts to glow faintly...</span>")
+	timer = world.time + 50
+	if(do_after(user, 40, target = user) && rune)
+		var/turf/T = get_turf(rune)
+		var/turf/source = get_turf(user)
+		if(is_blocked_turf(T))
+			teleporting = FALSE
+			user << "<span class='warning'>The rune is blocked by something, preventing teleportation!</span>"
+			user.update_action_buttons_icon()
+			return
+		PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, user))
+		PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(source, user))
+		playsound(T,'sound/magic/blink.ogg', 200, 1)
+		//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
+		playsound(source,'sound/magic/blink.ogg', 200, 1)
+		//playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
+		if(!do_after(user, 3, target = user) || !rune) //no walking away shitlord
+			teleporting = FALSE
+			if(user)
+				user.update_action_buttons_icon()
+			return
+		if(is_blocked_turf(T))
+			teleporting = FALSE
+			user << "<span class='warning'>The rune is blocked by something, preventing teleportation!</span>"
+			user.update_action_buttons_icon()
+			return
+		add_logs(user, rune, "teleported self from ([source.x],[source.y],[source.z]) to")
+		PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, user))
+		PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(source, user))
+		for(var/t in RANGE_TURFS(1, T))
+			var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, TRUE)) //blasts produced will not hurt allies
+			B.damage = 30
+		for(var/t in RANGE_TURFS(1, source))
+			var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, TRUE)) //but absolutely will hurt enemies
+			B.damage = 30
+		for(var/mob/living/L in range(1, source))
+			addtimer(src, "teleport_mob", 0, TIMER_NORMAL, source, L, T, user) //regardless, take all mobs near us along
+		sleep(6) //at this point the blasts detonate
+	else
+		timer = world.time
+	teleporting = FALSE
+	if(user)
+		user.update_action_buttons_icon()
+
+/obj/item/weapon/hierophant_staff/proc/teleport_mob(turf/source, mob/M, turf/target, mob/user)
+	var/turf/turf_to_teleport_to = get_step(target, get_dir(source, M)) //get position relative to caster
+	if(!turf_to_teleport_to || is_blocked_turf(turf_to_teleport_to))
+		return
+	animate(M, alpha = 0, time = 2, easing = EASE_OUT) //fade out
+	sleep(1)
+	if(!M)
+		return
+	M.visible_message("<span class='hierophant_warning'>[M] fades out!</span>")
+	sleep(2)
+	if(!M)
+		return
+	M.forceMove(turf_to_teleport_to)
+	sleep(1)
+	if(!M)
+		return
+	animate(M, alpha = 255, time = 2, easing = EASE_IN) //fade IN
+	sleep(1)
+	if(!M)
+		return
+	M.visible_message("<span class='hierophant_warning'>[M] fades in!</span>")
+	if(user != M)
+		add_logs(user, M, "teleported", null, "from ([source.x],[source.y],[source.z])")
+
+/obj/item/weapon/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
+	if(!T)
+		return
+	PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/cardinal, list(T, user))
+	playsound(T,'sound/magic/blink.ogg', 200, 1)
+	//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
+	sleep(2)
+	PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, user, friendly_fire_check))
+	for(var/d in cardinal)
+		addtimer(src, "blast_wall", 0, TIMER_NORMAL, T, d, user)
+
+/obj/item/weapon/hierophant_staff/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
+	if(!T)
+		return
+	var/range = blast_range
+	var/turf/previousturf = T
+	var/turf/J = get_step(previousturf, dir)
+	for(var/i in 1 to range)
+		if(!J)
+			return
+		PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(J, user, friendly_fire_check))
+		previousturf = J
+		J = get_step(previousturf, dir)
+
+/obj/item/weapon/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
+	if(!T)
+		return
+	PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, user))
+	playsound(T,'sound/magic/blink.ogg', 200, 1)
+	//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
+	sleep(2)
+	for(var/t in RANGE_TURFS(1, T))
+		PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, friendly_fire_check))

code/modules/mining/lavaland/ruins/gym.dm

@@ -22,7 +22,7 @@
 
 /obj/structure/stacklifter/attack_hand(mob/user as mob)
 	if(in_use)
-		user << "Its already in use - wait a bit."
+		user << "It's already in use - wait a bit."
 		return
 	else
 		in_use = 1
@@ -60,7 +60,7 @@
 
 /obj/structure/weightlifter/attack_hand(mob/user as mob)
 	if(in_use)
-		user << "Its already in use - wait a bit."
+		user << "It's already in use - wait a bit."
 		return
 	else
 		in_use = 1

code/modules/mining/machine_processing.dm

@@ -26,83 +26,93 @@
 	if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine)
 		if(machine.ore_iron)
 			if (machine.selected_iron==1)
-				dat += text("<A href='?src=\ref[src];sel_iron=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_iron=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_iron=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Iron: [machine.ore_iron]<br>")
+				dat += "<A href='?src=\ref[src];sel_iron=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Iron: [machine.ore_iron]<br>"
 		else
 			machine.selected_iron = 0
 
 		//sand - glass
 		if(machine.ore_glass)
 			if (machine.selected_glass==1)
-				dat += text("<A href='?src=\ref[src];sel_glass=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_glass=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_glass=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Sand: [machine.ore_glass]<br>")
+				dat += "<A href='?src=\ref[src];sel_glass=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Sand: [machine.ore_glass]<br>"
 		else
 			machine.selected_glass = 0
 
 		//plasma
 		if(machine.ore_plasma)
 			if (machine.selected_plasma==1)
-				dat += text("<A href='?src=\ref[src];sel_plasma=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_plasma=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_plasma=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Plasma: [machine.ore_plasma]<br>")
+				dat += "<A href='?src=\ref[src];sel_plasma=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Plasma: [machine.ore_plasma]<br>"
 		else
 			machine.selected_plasma = 0
 
 		//uranium
 		if(machine.ore_uranium)
 			if (machine.selected_uranium==1)
-				dat += text("<A href='?src=\ref[src];sel_uranium=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_uranium=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_uranium=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Uranium: [machine.ore_uranium]<br>")
+				dat += "<A href='?src=\ref[src];sel_uranium=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Uranium: [machine.ore_uranium]<br>"
 		else
 			machine.selected_uranium = 0
 
 		//gold
 		if(machine.ore_gold)
 			if (machine.selected_gold==1)
-				dat += text("<A href='?src=\ref[src];sel_gold=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_gold=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_gold=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Gold: [machine.ore_gold]<br>")
+				dat += "<A href='?src=\ref[src];sel_gold=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Gold: [machine.ore_gold]<br>"
 		else
 			machine.selected_gold = 0
 
 		//silver
 		if(machine.ore_silver)
 			if (machine.selected_silver==1)
-				dat += text("<A href='?src=\ref[src];sel_silver=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_silver=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_silver=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Silver: [machine.ore_silver]<br>")
+				dat += "<A href='?src=\ref[src];sel_silver=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Silver: [machine.ore_silver]<br>"
 		else
 			machine.selected_silver = 0
 
 		//diamond
 		if(machine.ore_diamond)
 			if (machine.selected_diamond==1)
-				dat += text("<A href='?src=\ref[src];sel_diamond=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_diamond=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_diamond=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Diamond: [machine.ore_diamond]<br>")
+				dat += "<A href='?src=\ref[src];sel_diamond=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Diamond: [machine.ore_diamond]<br>"
 		else
 			machine.selected_diamond = 0
 
 		//bananium
 		if(machine.ore_clown)
 			if (machine.selected_clown==1)
-				dat += text("<A href='?src=\ref[src];sel_clown=no'><font color='green'>Smelting</font></A> ")
+				dat += "<A href='?src=\ref[src];sel_clown=no'><font color='green'>Smelting</font></A> "
 			else
-				dat += text("<A href='?src=\ref[src];sel_clown=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Bananium: [machine.ore_clown]<br>")
+				dat += "<A href='?src=\ref[src];sel_clown=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Bananium: [machine.ore_clown]<br>"
 		else
 			machine.selected_clown = 0
 
+		//titanium
+		if(machine.ore_titanium)
+			if (machine.selected_titanium==1)
+				dat += "<A href='?src=\ref[src];sel_titanium=no'><font color='green'>Smelting</font></A> "
+			else
+				dat += "<A href='?src=\ref[src];sel_titanium=yes'><font color='red'>Not smelting</font></A> "
+			dat += "Titanium: [machine.ore_titanium]<br>"
+		else
+			machine.selected_titanium = 0
+
 
 		//On or off
 		dat += text("Machine is currently ")
@@ -114,7 +124,7 @@
 		dat+="---No Materials Loaded---"
 
 
-	user << browse("[dat]", "window=console_processing_unit")
+	user << browse(dat, "window=console_processing_unit")
 
 
 
@@ -163,6 +173,11 @@
 			machine.selected_clown = 1
 		else
 			machine.selected_clown = 0
+	if(href_list["sel_titanium"])
+		if (href_list["sel_titanium"] == "yes")
+			machine.selected_titanium = 1
+		else
+			machine.selected_titanium = 0
 	if(href_list["set_on"])
 		if (href_list["set_on"] == "on")
 			machine.on = 1
@@ -190,6 +205,7 @@
 	var/ore_iron = 0;
 	var/ore_clown = 0;
 	var/ore_adamantine = 0;
+	var/ore_titanium = 0;
 	var/selected_gold = 0
 	var/selected_silver = 0
 	var/selected_diamond = 0
@@ -198,86 +214,102 @@
 	var/selected_uranium = 0
 	var/selected_iron = 0
 	var/selected_clown = 0
+	var/selected_titanium = 0
 	var/on = 0 //0 = off, 1 =... oh you know!
 
 /obj/machinery/mineral/processing_unit/process()
-	var/i
-	for (i = 0; i < 10; i++)
+	for(var/i in 1 to 10)
 		if (on)
-			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium)
 				if (ore_glass > 0)
-					ore_glass--;
+					ore_glass--
 					generate_mineral(/obj/item/stack/sheet/glass)
 				else
 					on = 0
 				continue
-			if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
+			if (selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_titanium)
 				if (ore_glass > 0 && ore_iron > 0)
-					ore_glass--;
-					ore_iron--;
+					ore_glass--
+					ore_iron--
 					generate_mineral(/obj/item/stack/sheet/rglass)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (!selected_glass && selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium)
 				if (ore_gold > 0)
-					ore_gold--;
+					ore_gold--
 					generate_mineral(/obj/item/stack/sheet/mineral/gold)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (!selected_glass && !selected_gold && selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium)
 				if (ore_silver > 0)
-					ore_silver--;
+					ore_silver--
 					generate_mineral(/obj/item/stack/sheet/mineral/silver)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (!selected_glass && !selected_gold && !selected_silver && selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium)
 				if (ore_diamond > 0)
-					ore_diamond--;
+					ore_diamond--
 					generate_mineral(/obj/item/stack/sheet/mineral/diamond)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium)
 				if (ore_plasma > 0)
-					ore_plasma--;
+					ore_plasma--
 					generate_mineral(/obj/item/stack/sheet/mineral/plasma)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && selected_uranium && !selected_iron && !selected_clown && !selected_titanium)
 				if (ore_uranium > 0)
-					ore_uranium--;
+					ore_uranium--
 					generate_mineral(/obj/item/stack/sheet/mineral/uranium)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_titanium)
 				if (ore_iron > 0)
-					ore_iron--;
+					ore_iron--
 					generate_mineral(/obj/item/stack/sheet/metal)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_titanium)
 				if (ore_iron > 0 && ore_plasma > 0)
-					ore_iron--;
-					ore_plasma--;
+					ore_iron--
+					ore_plasma--
 					generate_mineral(/obj/item/stack/sheet/plasteel)
 				else
 					on = 0
 				continue
-			if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1)
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && selected_clown && !selected_titanium)
 				if (ore_clown > 0)
-					ore_clown--;
+					ore_clown--
 					generate_mineral(/obj/item/stack/sheet/mineral/bananium)
 				else
 					on = 0
 				continue
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && selected_titanium)
+				if (ore_titanium > 0)
+					ore_titanium--
+					generate_mineral(/obj/item/stack/sheet/mineral/titanium)
+				else
+					on = 0
+				continue
+			if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && !selected_iron && !selected_clown && selected_titanium)
+				if (ore_titanium > 0)
+					ore_titanium--
+					ore_plasma--
+					generate_mineral(/obj/item/stack/sheet/mineral/plastitanium)
+				else
+					on = 0
+				continue
 			//THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT.
 			//They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage
+			//Even in the dark year of 2016, where /tg/ is dead, Urist still hasn't finished this -Bawhoppennn
 			/*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
 				if (ore_uranium >= 2 && ore_diamond >= 1)
 					ore_uranium -= 2
@@ -395,4 +427,4 @@
 
 /obj/machinery/mineral/processing_unit/proc/generate_mineral(P)
 	var/O = new P(src)
-	unload_mineral(O)
+	unload_mineral(O)

code/modules/mining/machine_redemption.dm

@@ -19,7 +19,7 @@
 	var/ore_pickup_rate = 15
 	var/sheet_per_ore = 1
 	var/point_upgrade = 1
-	var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("uranium" = 30), ("diamond" = 50), ("bananium" = 60))
+	var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("titanium" = 30), ("uranium" = 30), ("diamond" = 50), ("bluespace crystal" = 50), ("bananium" = 60))
 	speed_process = 1
 
 /obj/machinery/mineral/ore_redemption/New()
@@ -30,7 +30,7 @@
 /obj/item/weapon/circuitboard/machine/ore_redemption
 	name = "circuit board (Ore Redemption)"
 	build_path = /obj/machinery/mineral/ore_redemption
-	origin_tech = "programming=2;engineering=2;plasmatech=3"
+	origin_tech = "programming=1;engineering=2"
 	req_components = list(
 							/obj/item/weapon/stock_parts/console_screen = 1,
 							/obj/item/weapon/stock_parts/matter_bin = 1,
@@ -59,11 +59,6 @@
 			var/obj/item/stack/sheet/s = new processed_sheet(src,0)
 			s.amount = 0
 			stack_list[processed_sheet] = s
-			if(s.name != "glass" && s.name != "metal")		//we can get these from cargo anyway
-				var/msg = "[capitalize(s.name)] sheets are now available in the Cargo Bay."
-				for(var/obj/machinery/requests_console/D in allConsoles)
-					if(D.department == "Science" || D.department == "Robotics" || D.department == "Research Director's Desk" || (D.department == "Chemistry" && (s.name == "uranium" || s.name == "solid plasma")))
-						D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
 		var/obj/item/stack/sheet/storage = stack_list[processed_sheet]
 		storage.amount += sheet_per_ore //Stack the sheets
 		O.loc = null //Let the old sheet...
@@ -93,8 +88,28 @@
 					else
 						process_sheet(O)
 						i++
+		if(i > 0 && z == ZLEVEL_STATION)
+			var/area/orm_area = get_area(src)
+			var/msg = "Now available in [orm_area.map_name]:"
+			for(var/s in stack_list) // Making an announcement for cargo
+				var/obj/item/stack/sheet/mats = stack_list[s]
+				msg += "\n[capitalize(mats.name)]: [mats.amount] sheets"
+			for(var/obj/machinery/requests_console/D in allConsoles)
+				if(D.department == "Science" || D.department == "Robotics" || D.department == "Research Director's Desk" || D.department == "Chemistry" || D.department == "Bar")
+					D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
 
 /obj/machinery/mineral/ore_redemption/attackby(obj/item/weapon/W, mob/user, params)
+	if (!powered())
+		return
+	if(istype(W,/obj/item/weapon/card/id))
+		var/obj/item/weapon/card/id/I = user.get_active_held_item()
+		if(istype(I) && !istype(inserted_id))
+			if(!user.drop_item())
+				return
+			I.forceMove(src)
+			inserted_id = I
+			interact(user)
+		return
 	if(exchange_parts(user, W))
 		return
 
@@ -109,20 +124,9 @@
 	if(default_deconstruction_crowbar(W))
 		return
 
-	if (!powered())
-		return
-	if(istype(W,/obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/I = user.get_active_hand()
-		if(istype(I) && !istype(inserted_id))
-			if(!user.drop_item())
-				return
-			I.loc = src
-			inserted_id = I
-			interact(user)
-		return
 	return ..()
 
-/obj/machinery/mineral/ore_redemption/deconstruction()
+/obj/machinery/mineral/ore_redemption/on_deconstruction()
 	empty_content()
 
 /obj/machinery/mineral/ore_redemption/proc/SmeltMineral(obj/item/weapon/ore/O)
@@ -158,12 +162,22 @@
 				dat += "<br>"		//just looks nicer
 			dat += text("[capitalize(s.name)]: [s.amount] <A href='?src=\ref[src];release=[s.type]'>Release</A><br>")
 
-	if((/obj/item/stack/sheet/metal in stack_list) && (/obj/item/stack/sheet/mineral/plasma in stack_list))
-		var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
-		var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
-		if(min(metalstack.amount, plasmastack.amount))
-			dat += text("Plasteel Alloy (Metal + Plasma): <A href='?src=\ref[src];plasteel=1'>Smelt</A><BR>")
+	var/obj/item/stack/sheet/metalstack
+	if(/obj/item/stack/sheet/metal in stack_list)
+		metalstack = stack_list[/obj/item/stack/sheet/metal]
 
+	var/obj/item/stack/sheet/plasmastack
+	if((/obj/item/stack/sheet/mineral/plasma in stack_list))
+		plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
+
+	var/obj/item/stack/sheet/mineral/titaniumstack
+	if((/obj/item/stack/sheet/mineral/titanium in stack_list))
+		titaniumstack = stack_list[/obj/item/stack/sheet/mineral/titanium]
+
+	if(metalstack && plasmastack && min(metalstack.amount, plasmastack.amount))
+		dat += text("Plasteel Alloy (Metal + Plasma): <A href='?src=\ref[src];alloytype1=/obj/item/stack/sheet/metal;alloytype2=/obj/item/stack/sheet/mineral/plasma;alloytypeout=/obj/item/stack/sheet/plasteel'>Smelt</A><BR>")
+	if(titaniumstack && plasmastack && min(titaniumstack.amount, plasmastack.amount))
+		dat += text("Plastitanium Alloy (Titanium + Plasma): <A href='?src=\ref[src];alloytype1=/obj/item/stack/sheet/mineral/titanium;alloytype2=/obj/item/stack/sheet/mineral/plasma;alloytypeout=/obj/item/stack/sheet/mineral/plastitanium'>Smelt</A><BR>")
 	dat += text("<br><div class='statusDisplay'><b>Mineral Value List:</b><BR>[get_ore_values()]</div>")
 
 	var/datum/browser/popup = new(user, "console_stacking_machine", "Ore Redemption Machine", 400, 500)
@@ -195,7 +209,7 @@
 				else
 					usr << "<span class='warning'>Required access not found.</span>"
 		else if(href_list["choice"] == "insert")
-			var/obj/item/weapon/card/id/I = usr.get_active_hand()
+			var/obj/item/weapon/card/id/I = usr.get_active_held_item()
 			if(istype(I))
 				if(!usr.drop_item())
 					return
@@ -216,20 +230,22 @@
 				stack_list -= text2path(href_list["release"])
 		else
 			usr << "<span class='warning'>Required access not found.</span>"
-	if(href_list["plasteel"])
+	if(href_list["alloytype1"] && href_list["alloytype2"] && href_list["alloytypeout"])
+		var/alloytype1 = text2path(href_list["alloytype1"])
+		var/alloytype2 = text2path(href_list["alloytype2"])
+		var/alloytypeout = text2path(href_list["alloytypeout"])
 		if(check_access(inserted_id) || allowed(usr))
-			if(!(/obj/item/stack/sheet/metal in stack_list)) return
-			if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
-			var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
-			var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
-
+			if(!(alloytype1 in stack_list)) return
+			if(!(alloytype2 in stack_list)) return
+			var/obj/item/stack/sheet/stack1 = stack_list[alloytype1]
+			var/obj/item/stack/sheet/stack2 = stack_list[alloytype2]
 			var/desired = input("How much?", "How much would you like to smelt?", 1) as num
-			var/obj/item/stack/sheet/plasteel/plasteelout = new
-			plasteelout.amount = round(min(desired,50,metalstack.amount,plasmastack.amount))
-			if(plasteelout.amount >= 1)
-				metalstack.amount -= plasteelout.amount
-				plasmastack.amount -= plasteelout.amount
-				unload_mineral(plasteelout)
+			var/obj/item/stack/sheet/alloyout = new alloytypeout
+			alloyout.amount = round(min(desired,50,stack1.amount,stack2.amount))
+			if(alloyout.amount >= 1)
+				stack1.amount -= alloyout.amount
+				stack2.amount -= alloyout.amount
+				unload_mineral(alloyout)
 		else
 			usr << "<span class='warning'>Required access not found.</span>"
 	updateUsrDialog()
@@ -239,14 +255,7 @@
 	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 	s.set_up(5, 1, src)
 	s.start()
-	if(severity == 1)
-		if(prob(50))
-			empty_content()
-			qdel(src)
-	else if(severity == 2)
-		if(prob(25))
-			empty_content()
-			qdel(src)
+	..()
 
 //empty the redemption machine by stacks of at most max_amount (50 at this time) size
 /obj/machinery/mineral/ore_redemption/proc/empty_content()
@@ -259,6 +268,7 @@
 			s.use(s.max_amount)
 		s.loc = loc
 		s.layer = initial(s.layer)
+		s.plane = initial(s.plane)
 
 /obj/machinery/mineral/ore_redemption/power_change()
 	..()

code/modules/mining/machine_stacking.dm

@@ -33,7 +33,7 @@
 
 	dat += text("<br>Stacking: [machine.stack_amt]<br><br>")
 
-	user << browse("[dat]", "window=console_stacking_machine")
+	user << browse(dat, "window=console_stacking_machine")
 
 	return
 

code/modules/mining/machine_vending.dm

@@ -8,49 +8,54 @@
 	density = 1
 	anchored = 1
 	var/obj/item/weapon/card/id/inserted_id
-	var/list/prize_list = list(
-		new /datum/data/mining_equipment("Stimpack",			/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack,	    	50),
-		new /datum/data/mining_equipment("Stimpack Bundle",		/obj/item/weapon/storage/box/medipens/utility,	 				  		200),
-		new /datum/data/mining_equipment("Whiskey",             /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,    		100),
-		new /datum/data/mining_equipment("Absinthe",            /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe/premium,100),
-		new /datum/data/mining_equipment("Cigar",               /obj/item/clothing/mask/cigarette/cigar/havana,                    		150),
-		new /datum/data/mining_equipment("Soap",                /obj/item/weapon/soap/nanotrasen, 						          		200),
-		new /datum/data/mining_equipment("Survival knife",      /obj/item/weapon/kitchen/knife/combat/survival,                          300),
-		new /datum/data/mining_equipment("Laser Pointer",       /obj/item/device/laser_pointer, 				                   		300),
-		new /datum/data/mining_equipment("Alien Toy",           /obj/item/clothing/mask/facehugger/toy, 		                   		300),
-		new /datum/data/mining_equipment("Advanced Scanner",	/obj/item/device/t_scanner/adv_mining_scanner,                     		800),
-		new /datum/data/mining_equipment("Stabilizing Serum",	/obj/item/weapon/hivelordstabilizer			 ,                     		400),
-		new /datum/data/mining_equipment("Fulton Beacon",		/obj/item/fulton_core			 ,                     					400),
-		new /datum/data/mining_equipment("Shelter Capsule",		/obj/item/weapon/survivalcapsule			 ,                     		400),
-		new /datum/data/mining_equipment("Motion Tracker",		/obj/item/device/t_scanner/motionTracker	 ,                     		400),
-		new /datum/data/mining_equipment("GAR scanners",		/obj/item/clothing/glasses/meson/gar,					  		   		500),
+	var/list/prize_list = list( //if you add something to this, please, for the love of god, use tabs and not spaces.
+		new /datum/data/mining_equipment("Stimpack",			/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack,			50),
+		new /datum/data/mining_equipment("Stimpack Bundle",		/obj/item/weapon/storage/box/medipens/utility,							200),
+		new /datum/data/mining_equipment("Whiskey",				/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,			100),
+		new /datum/data/mining_equipment("Absinthe",			/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe/premium,100),
+		new /datum/data/mining_equipment("Cigar",				/obj/item/clothing/mask/cigarette/cigar/havana,							150),
+		new /datum/data/mining_equipment("Soap",				/obj/item/weapon/soap/nanotrasen,										200),
+		new /datum/data/mining_equipment("Laser Pointer",		/obj/item/device/laser_pointer,											300),
+		new /datum/data/mining_equipment("Alien Toy",			/obj/item/clothing/mask/facehugger/toy,									300),
+		new /datum/data/mining_equipment("Advanced Scanner",	/obj/item/device/t_scanner/adv_mining_scanner,							800),
+		new /datum/data/mining_equipment("Stabilizing Serum",	/obj/item/weapon/hivelordstabilizer,									400),
+		new /datum/data/mining_equipment("Fulton Beacon",		/obj/item/fulton_core,													400),
+		new /datum/data/mining_equipment("Shelter Capsule",		/obj/item/weapon/survivalcapsule,										400),
+		new /datum/data/mining_equipment("GAR scanners",		/obj/item/clothing/glasses/meson/gar,									500),
 		new /datum/data/mining_equipment("Explorer's Webbing",	/obj/item/weapon/storage/belt/mining,									500),
-		new /datum/data/mining_equipment("Survival Medipen",	/obj/item/weapon/reagent_containers/hypospray/medipen/survival,			600),
-		new /datum/data/mining_equipment("Brute First-Aid Kit",	/obj/item/weapon/storage/firstaid/brute,						   		600),
-		new /datum/data/mining_equipment("Tracking Implant Kit",/obj/item/weapon/storage/box/minertracker,                              600),
-		new /datum/data/mining_equipment("Jaunter",             /obj/item/device/wormhole_jaunter,										750),
-		new /datum/data/mining_equipment("Kinetic Crusher", 	/obj/item/weapon/twohanded/required/mining_hammer,						750),
-		new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator,               	   		750),
-		new /datum/data/mining_equipment("Resonator",           /obj/item/weapon/resonator,                                    	   		800),
-		new /datum/data/mining_equipment("whetstone",           /obj/item/weapon/sharpener,                                             1000),
-		new /datum/data/mining_equipment("Survival Medipen Bundle",		/obj/item/weapon/storage/box/medipens/utility1,	 				2000),
-		new /datum/data/mining_equipment("Fulton Pack",         /obj/item/weapon/extraction_pack,                                    	1000),
-		new /datum/data/mining_equipment("Lazarus Injector",    /obj/item/weapon/lazarus_injector,                                		1000),
-		new /datum/data/mining_equipment("Silver Pickaxe",		/obj/item/weapon/pickaxe/silver,				                  		1000),
-		new /datum/data/mining_equipment("Jetpack Upgrade",		/obj/item/hardsuit_jetpack,	              								2000),
-		new /datum/data/mining_equipment("Space Cash",    		/obj/item/stack/spacecash/c1000,                    			  		2000),
-		new /datum/data/mining_equipment("Mining Hardsuit",		/obj/item/clothing/suit/space/hardsuit/mining,				            2000),
-		new /datum/data/mining_equipment("Diamond Pickaxe",		/obj/item/weapon/pickaxe/diamond,				                  		2000),
-		new /datum/data/mining_equipment("Super Resonator",     /obj/item/weapon/resonator/upgraded,                              		2500),
-		new /datum/data/mining_equipment("Super Accelerator",	/obj/item/weapon/gun/energy/kinetic_accelerator/super,			  		3000),
-		new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card,               			   		500),
-		new /datum/data/mining_equipment("Mining Drone",        /mob/living/simple_animal/hostile/mining_drone,                   		800),
-		new /datum/data/mining_equipment("Drone Melee Upgrade", /obj/item/device/mine_bot_ugprade,      			   			   		400),
-		new /datum/data/mining_equipment("Drone Health Upgrade",/obj/item/device/mine_bot_ugprade/health,      			   	       		400),
-		new /datum/data/mining_equipment("Drone Ranged Upgrade",/obj/item/device/mine_bot_ugprade/cooldown,      			   	   		600),
-		new /datum/data/mining_equipment("Drone AI Upgrade",    /obj/item/slimepotion/sentience/mining,      			   	      		1000),
+		new /datum/data/mining_equipment("Survival Medipen",	/obj/item/weapon/reagent_containers/hypospray/medipen/survival,			500),
+		new /datum/data/mining_equipment("Brute First-Aid Kit",	/obj/item/weapon/storage/firstaid/brute,								600),
+		new /datum/data/mining_equipment("Tracking Implant Kit",/obj/item/weapon/storage/box/minertracker,								600),
+		new /datum/data/mining_equipment("Jaunter",				/obj/item/device/wormhole_jaunter,										750),
+		new /datum/data/mining_equipment("Kinetic Crusher",		/obj/item/weapon/twohanded/required/mining_hammer,						750),
+		new /datum/data/mining_equipment("Kinetic Accelerator",	/obj/item/weapon/gun/energy/kinetic_accelerator,						750),
+		new /datum/data/mining_equipment("Resonator",			/obj/item/weapon/resonator,												800),
+		new /datum/data/mining_equipment("Fulton Pack",			/obj/item/weapon/extraction_pack,										1000),
+		new /datum/data/mining_equipment("Lazarus Injector",	/obj/item/weapon/lazarus_injector,										1000),
+		new /datum/data/mining_equipment("Silver Pickaxe",		/obj/item/weapon/pickaxe/silver,										1000),
+		new /datum/data/mining_equipment("Jetpack Upgrade",		/obj/item/weapon/tank/jetpack/suit,										2000),
+		new /datum/data/mining_equipment("Space Cash",			/obj/item/stack/spacecash/c1000,										2000),
+		new /datum/data/mining_equipment("Mining Hardsuit",		/obj/item/clothing/suit/space/hardsuit/mining,							2000),
+		new /datum/data/mining_equipment("Diamond Pickaxe",		/obj/item/weapon/pickaxe/diamond,										2000),
+		new /datum/data/mining_equipment("Super Resonator",		/obj/item/weapon/resonator/upgraded,									2500),
+		new /datum/data/mining_equipment("KA White Tracer Rounds",	/obj/item/borg/upgrade/modkit/tracer,								100),
+		new /datum/data/mining_equipment("KA Adjustable Tracer Rounds",	/obj/item/borg/upgrade/modkit/tracer/adjustable,				150),
+		new /datum/data/mining_equipment("KA Super Chassis",	/obj/item/borg/upgrade/modkit/chassis_mod,								250),
+		new /datum/data/mining_equipment("KA Hyper Chassis",	/obj/item/borg/upgrade/modkit/chassis_mod/orange,						300),
+		new /datum/data/mining_equipment("KA Range Increase",	/obj/item/borg/upgrade/modkit/range,									1000),
+		new /datum/data/mining_equipment("KA Damage Increase",	/obj/item/borg/upgrade/modkit/damage,									1000),
+		new /datum/data/mining_equipment("KA Cooldown Decrease",/obj/item/borg/upgrade/modkit/cooldown,									1000),
+		new /datum/data/mining_equipment("KA AoE Damage",		/obj/item/borg/upgrade/modkit/aoe/mobs,									2000),
+		new /datum/data/mining_equipment("Point Transfer Card",	/obj/item/weapon/card/mining_point_card,								500),
+		new /datum/data/mining_equipment("Mining Drone",		/mob/living/simple_animal/hostile/mining_drone,							800),
+		new /datum/data/mining_equipment("Drone Melee Upgrade",	/obj/item/device/mine_bot_ugprade,										400),
+		new /datum/data/mining_equipment("Drone Health Upgrade",/obj/item/device/mine_bot_ugprade/health,								400),
+		new /datum/data/mining_equipment("Drone Ranged Upgrade",/obj/item/device/mine_bot_ugprade/cooldown,								600),
+		new /datum/data/mining_equipment("Drone AI Upgrade",	/obj/item/slimepotion/sentience/mining,									1000),
+		new /datum/data/mining_equipment("Jump Boots",			/obj/item/clothing/shoes/bhop,											2500),
 		)
-/datum/data/mining_equipment/
+
+/datum/data/mining_equipment
 	var/equipment_name = "generic"
 	var/equipment_path = null
 	var/cost = 0
@@ -97,7 +102,7 @@
 	else
 		dat += "No ID inserted.  <A href='?src=\ref[src];choice=insert'>Insert ID.</A><br>"
 	dat += "</div>"
-	dat += "<br><b>Equipment point cost list:</b><BR><table border='0' width='200'>"
+	dat += "<br><b>Equipment point cost list:</b><BR><table border='0' width='300'>"
 	for(var/datum/data/mining_equipment/prize in prize_list)
 		dat += "<tr><td>[prize.equipment_name]</td><td>[prize.cost]</td><td><A href='?src=\ref[src];purchase=\ref[prize]'>Purchase</A></td></tr>"
 	dat += "</table>"
@@ -117,7 +122,7 @@
 				inserted_id.verb_pickup()
 				inserted_id = null
 		else if(href_list["choice"] == "insert")
-			var/obj/item/weapon/card/id/I = usr.get_active_hand()
+			var/obj/item/weapon/card/id/I = usr.get_active_held_item()
 			if(istype(I))
 				if(!usr.drop_item())
 					return
@@ -145,7 +150,7 @@
 		RedeemVoucher(I, user)
 		return
 	if(istype(I,/obj/item/weapon/card/id))
-		var/obj/item/weapon/card/id/C = usr.get_active_hand()
+		var/obj/item/weapon/card/id/C = usr.get_active_held_item()
 		if(istype(C) && !istype(inserted_id))
 			if(!usr.drop_item())
 				return
@@ -161,34 +166,29 @@
 	return ..()
 
 /obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer)
-	var/items = list("Crusher Kit", "Extract and Rescue Kit", "Hunter Kit", "Mining Drone", "Resonator and Advanced Scanner", "Survival Capsule and Explorer's Webbing")//Alphabetical, please.
+	var/items = list("Survival Capsule and Explorer's Webbing", "Resonator and Advanced Scanner", "Mining Drone", "Extraction and Rescue Kit", "Crusher Kit", "Mining Conscription Kit")
 
 	var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in items
 	if(!selection || !Adjacent(redeemer) || qdeleted(voucher) || voucher.loc != redeemer)
 		return
-	switch(selection)//Alphabetical, please.
+	switch(selection)
+		if("Survival Capsule and Explorer's Webbing")
+			new /obj/item/weapon/storage/belt/mining/vendor(src.loc)
+		if("Resonator and Advanced Scanner")
+			new /obj/item/weapon/resonator(src.loc)
+			new /obj/item/device/t_scanner/adv_mining_scanner(src.loc)
+		if("Mining Drone")
+			new /mob/living/simple_animal/hostile/mining_drone(src.loc)
+			new /obj/item/weapon/weldingtool/hugetank(src.loc)
+		if("Extraction and Rescue Kit")
+			new /obj/item/weapon/extraction_pack(loc)
+			new /obj/item/fulton_core(loc)
 		if("Crusher Kit")
 			new /obj/item/weapon/twohanded/required/mining_hammer(loc)
 			new /obj/item/weapon/storage/belt/mining/alt(loc)
 			new /obj/item/weapon/extinguisher/mini(loc)
-		if("Extract and Rescue Kit")
-			new /obj/item/stack/sheet/metal/five(loc)
-			new /obj/item/weapon/extraction_pack(loc)
-			new /obj/item/fulton_core(loc)
-			new /obj/item/weapon/reagent_containers/hypospray/medipen/survival(loc)
-		if("Hunter Kit")
-			new /obj/item/weapon/storage/belt/mining(loc)
-			new /obj/item/device/t_scanner/motionTracker(loc)
-			new /obj/item/weapon/stock_parts/cell/high/plus(loc)
-			new /obj/item/weapon/screwdriver(loc)
-		if("Mining Drone")
-			new /mob/living/simple_animal/hostile/mining_drone(loc)
-			new /obj/item/weapon/weldingtool/hugetank(loc)
-		if("Resonator and Advanced Scanner")
-			new /obj/item/weapon/resonator(src.loc)
-			new /obj/item/device/t_scanner/adv_mining_scanner(loc)
-		if("Survival Capsule and Explorer's Webbing")
-			new /obj/item/weapon/storage/belt/mining/vendor(loc)
+		if("Mining Conscription Kit")
+			new /obj/item/weapon/storage/backpack/dufflebag/mining_conscript(loc)
 
 	feedback_add_details("mining_voucher_redeemed", selection)
 	qdel(voucher)
@@ -216,7 +216,7 @@
 		new /datum/data/mining_equipment("Sulphuric Acid",			/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,        		500),
 		new /datum/data/mining_equipment("Brute First-Aid Kit",		/obj/item/weapon/storage/firstaid/brute,						   		600),
 		new /datum/data/mining_equipment("Grey Slime Extract",		/obj/item/slime_extract/grey,				       		           		1000),
-		new /datum/data/mining_equipment("Modification Kit",    	/obj/item/modkit,                                	                	1700),
+		new /datum/data/mining_equipment("Modification Kit",    	/obj/item/borg/upgrade/modkit/trigger_guard, 		                	1700),
 		new /datum/data/mining_equipment("The Liberator's Legacy",  /obj/item/weapon/storage/box/rndboards,      			      			2000),
 
 		)
@@ -238,7 +238,7 @@
 	desc = "A token to redeem a piece of equipment. Use it on a mining equipment vendor."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "mining_voucher"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 
 /**********************Mining Point Card**********************/
 
@@ -262,3 +262,35 @@
 /obj/item/weapon/card/mining_point_card/examine(mob/user)
 	..()
 	user << "There's [points] point\s on the card."
+
+///Conscript kit
+/obj/item/weapon/card/mining_access_card
+	name = "mining access card"
+	desc = "A small card, that when used on any ID, will add mining access."
+	icon_state = "data"
+
+/obj/item/weapon/card/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity)
+	if(istype(AM, /obj/item/weapon/card/id) && proximity)
+		var/obj/item/weapon/card/id/I = AM
+		I.access |=	access_mining
+		I.access |= access_mining_station
+		I.access |= access_mineral_storeroom
+		I.access |= access_cargo
+		user  << "You upgrade [I] with mining access."
+		qdel(src)
+	..()
+
+/obj/item/weapon/storage/backpack/dufflebag/mining_conscript
+	name = "mining conscription kit"
+	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
+
+/obj/item/weapon/storage/backpack/dufflebag/mining_conscript/New()
+	..()
+	new /obj/item/weapon/pickaxe/mini(src)
+	new /obj/item/clothing/glasses/meson(src)
+	new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
+	new /obj/item/weapon/storage/bag/ore(src)
+	new /obj/item/clothing/suit/hooded/explorer(src)
+	new /obj/item/device/encryptionkey/headset_cargo(src)
+	new /obj/item/clothing/mask/gas/explorer(src)
+	new /obj/item/weapon/card/mining_access_card(src)

code/modules/mining/mine_items.dm

@@ -2,10 +2,15 @@
 
 //this item is intended to give the effect of entering the mine, so that light gradually fades
 /obj/effect/light_emitter
-	name = "Light-emtter"
+	name = "Light emitter"
 	anchored = 1
-	unacidable = 1
-	luminosity = 8
+	invisibility = 101
+	var/set_luminosity = 8
+	var/set_cap = 0
+
+/obj/effect/light_emitter/New()
+	..()
+	SetLuminosity(set_luminosity, set_cap)
 
 /**********************Miner Lockers**************************/
 
@@ -18,7 +23,7 @@
 	contents = list()
 	new /obj/item/weapon/storage/backpack/dufflebag(src)
 	new /obj/item/weapon/storage/backpack/explorer(src)
-	new /obj/item/weapon/storage/backpack/satchel_explorer(src)
+	new /obj/item/weapon/storage/backpack/satchel/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)
@@ -41,11 +46,14 @@
 	new /obj/item/weapon/shovel(src)
 	new /obj/item/weapon/pickaxe/mini(src)
 	new /obj/item/device/radio/headset/headset_cargo/mining(src)
-	new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
+	new /obj/item/device/flashlight/seclite(src)
+	new /obj/item/weapon/storage/bag/plants(src)
 	new /obj/item/weapon/storage/bag/ore(src)
+	new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
 	new /obj/item/weapon/gun/energy/kinetic_accelerator(src)
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/weapon/survivalcapsule(src)
+	new /obj/item/device/assault_pod/mining(src)
 
 
 /**********************Shuttle Computer**************************/
@@ -55,9 +63,16 @@
 	desc = "Used to call and send the mining shuttle."
 	circuit = /obj/item/weapon/circuitboard/computer/mining_shuttle
 	shuttleId = "mining"
-	possible_destinations = "mining_home;mining_away"
+	possible_destinations = "mining_home;mining_away;landing_zone_dock"
 	no_destination_swap = 1
-	light_color = LIGHT_COLOR_CYAN
+	var/global/list/dumb_rev_heads = list()
+
+/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
+	if(user.z == ZLEVEL_STATION && user.mind && (user.mind in ticker.mode.head_revolutionaries) && !(user.mind in dumb_rev_heads))
+		user << "<span class='warning'>You get a feeling that leaving the station might be a REALLY dumb idea...</span>"
+		dumb_rev_heads += user.mind
+		return
+	..()
 
 /*********************Pickaxe & Drills**************************/
 
@@ -70,7 +85,7 @@
 	force = 15
 	throwforce = 10
 	item_state = "pickaxe"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
 	var/digspeed = 40
 	var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
@@ -84,7 +99,7 @@
 	force = 10
 	throwforce = 7
 	slot_flags = SLOT_BELT
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=1000)
 
 /obj/item/weapon/pickaxe/proc/playDigSound()
@@ -159,7 +174,7 @@
 	var/digspeed = 20
 	throwforce = 4
 	item_state = "shovel"
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=50)
 	origin_tech = "materials=2;engineering=2"
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -172,14 +187,14 @@
 	item_state = "spade"
 	force = 5
 	throwforce = 7
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/weapon/emptysandbag
 	name = "empty sandbag"
 	desc = "A bag to be filled with sand."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "sandbag"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 
 /obj/item/weapon/emptysandbag/attackby(obj/item/W, mob/user, params)
 	if(istype(W,/obj/item/weapon/ore/glass))
@@ -214,7 +229,7 @@
 	desc = "An emergency shelter stored within a pocket of bluespace."
 	icon_state = "capsule"
 	icon = 'icons/obj/mining.dmi'
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "engineering=3;bluespace=3"
 	var/template_id = "shelter_alpha"
 	var/datum/map_template/shelter/template
@@ -273,42 +288,11 @@
 		PoolOrNew(/obj/effect/particle_effect/smoke, get_turf(src))
 		qdel(src)
 
+
+
 //Pod turfs and objects
 
 
-//Floors
-/turf/open/floor/pod
-	name = "pod floor"
-	icon_state = "podfloor"
-	icon_regular_floor = "podfloor"
-	floor_tile = /obj/item/stack/tile/pod
-
-/turf/open/floor/pod/light
-	icon_state = "podfloor_light"
-	icon_regular_floor = "podfloor_light"
-	floor_tile = /obj/item/stack/tile/pod/light
-
-/turf/open/floor/pod/dark
-	icon_state = "podfloor_dark"
-	icon_regular_floor = "podfloor_dark"
-	floor_tile = /obj/item/stack/tile/pod/dark
-
-//Walls
-/turf/closed/wall/shuttle/survival
-	name = "pod wall"
-	desc = "An easily-compressable wall used for temporary shelter."
-	icon = 'icons/turf/walls/survival_pod_walls.dmi'
-	icon_state = "smooth"
-	walltype = "shuttle"
-	smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
-	canSmoothWith = list(/turf/closed/wall/shuttle/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod, /obj/structure/shuttle/engine)
-
-/turf/closed/wall/shuttle/survival/nodiagonal
-	smooth = SMOOTH_MORE
-
-/turf/closed/wall/shuttle/survival/pod
-	canSmoothWith = list(/turf/closed/wall/shuttle/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
-
 //Window
 /obj/structure/window/shuttle/survival_pod
 	name = "pod window"
@@ -374,10 +358,10 @@
 
 /obj/item/device/gps/computer/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT))
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		playsound(src.loc, W.usesound, 50, 1)
 		user.visible_message("<span class='warning'>[user] disassembles the gps.</span>", \
 						"<span class='notice'>You start to disassemble the gps...</span>", "You hear clanking and banging noises.")
-		if(do_after(user, 20/W.toolspeed, target = src))
+		if(do_after(user, 20*W.toolspeed, target = src))
 			new /obj/item/device/gps(src.loc)
 			qdel(src)
 			return ..()
@@ -437,18 +421,20 @@
 	var/arbitraryatmosblockingvar = TRUE
 	var/buildstacktype = /obj/item/stack/sheet/metal
 	var/buildstackamount = 5
+	CanAtmosPass = ATMOS_PASS_NO
 
 /obj/structure/fans/deconstruct()
-	if(buildstacktype)
-		new buildstacktype(loc,buildstackamount)
-	..()
+	if(!(flags & NODECONSTRUCT))
+		if(buildstacktype)
+			new buildstacktype(loc,buildstackamount)
+	qdel(src)
 
 /obj/structure/fans/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT))
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		playsound(src.loc, W.usesound, 50, 1)
 		user.visible_message("<span class='warning'>[user] disassembles the fan.</span>", \
 						"<span class='notice'>You start to disassemble the fan...</span>", "You hear clanking and banging noises.")
-		if(do_after(user, 20/W.toolspeed, target = src))
+		if(do_after(user, 20*W.toolspeed, target = src))
 			deconstruct()
 			return ..()
 
@@ -465,12 +451,10 @@
 	air_update_turf(1)
 
 /obj/structure/fans/Destroy()
-	arbitraryatmosblockingvar = FALSE
-	air_update_turf(1)
-	return ..()
+	var/turf/T = loc
+	. = ..()
+	T.air_update_turf(1)
 
-/obj/structure/fans/CanAtmosPass(turf/T)
-	return !arbitraryatmosblockingvar
 
 //Signs
 /obj/structure/sign/mining
@@ -494,149 +478,221 @@
 	layer = BELOW_MOB_LAYER
 	density = 0
 
-//////////////////////
-////MOTION TRACKER////
-//////////////////////
+///Mining Base////
 
-/obj/item/device/t_scanner/motionTracker
-	name = "motion tracker"
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "tracker"
-	desc = "A nifty handheld motion tracker. Requires meson scanners to function properly."
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	var/cooldown = 35
-	var/on_cooldown = 0
-	var/range = 7
-	var/meson = FALSE
-	var/obj/item/weapon/stock_parts/cell/cell = new
-	var/cellcharge
-	var/cellmaxcharge
-	var/soundDetect = 'sound/effects/trackFull.ogg'
-	var/soundNoDetect = 'sound/effects/trackHalf.ogg'
-	var/soundToggle = 'sound/effects/switch.ogg'
-	var/powerReq = 10
-	origin_tech = "engineering=3;magnets=4"
+/area/shuttle/auxillary_base
+	name = "Auxillary Base"
+	luminosity = 0 //Lighting gets lost when it lands anyway
 
-/obj/item/device/t_scanner/motionTracker/New()
-	cellcharge = cell.charge
-	cellmaxcharge = cell.maxcharge
-	updateicon()
+/obj/machinery/computer/shuttle/auxillary_base
+	name = "auxillary base management console"
+	icon = 'icons/obj/terminals.dmi'
+	icon_state = "dorm_available"
+	shuttleId = "colony_drop"
+	desc = "Allows a deployable expedition base to be dropped from the station to a designated mining location. It can also \
+interface with the mining shuttle at the landing site if a mobile beacon is also deployed."
+	var/launch_warning = TRUE
 
-/obj/item/device/t_scanner/motionTracker/process()
-	updateicon()
-	if(!on || !cell)
-		on = 0
-		SSobj.processing.Remove(src)
-		return
-	if(cell.charge > powerReq)
-		scan()
-	cell.charge -= powerReq
-	if(cell.charge < powerReq)
-		playsound(get_turf(src),'sound/machines/twobeep.ogg', 15, 0 , -5)
-		on = 0
-		SSobj.processing.Remove(src)
-		if(cell.charge <= 0)//In the event we have negative energy, somehow.
-			cell.charge = 0
-		updateicon()
-	cellcharge = cell.charge
-	cellmaxcharge = cell.maxcharge
-	cell.updateicon()
+	req_one_access = list(access_cargo, access_construction, access_heads)
+	possible_destinations = null
+	clockwork = TRUE
+	var/obj/item/device/gps/internal/base/locator
 
-/obj/item/device/t_scanner/motionTracker/attack_self(mob/user)
-	add_fingerprint(usr)
-	updateicon()
-	if(!cell)
-		user << text("<span class='warning'>[src] has no power supply.</span>")
-		return
-	playsound(get_turf(src), soundToggle, 100, 0, -5)
-	if(cell.charge < powerReq)
-		user << text("<span class='warning'>The power light on [src] flashes.</span>")
-		return
-	else if(cell.charge > powerReq)
-		on = !on
-		if(on)
-			user << text("<span class='notice'>You turn on [src].</span>")
-			SSobj.processing |= src
-		if(!on)
-			user << text("<span class='notice'>You turn off [src].</span>")
-
-/obj/item/device/t_scanner/motionTracker/proc/updateicon()
-	if(cell && cellcharge)
-		if(cell && cell.charge < (cell.maxcharge/5))
-			icon_state = "trackerLow"
-		else if(cell && cell.charge < (cell.maxcharge/2))
-			icon_state = "trackerHalf"
-		else if(cell && cell.charge > (cell.maxcharge/2))
-			icon_state = "trackerFull"
-	if(!cellcharge || !cell || cellcharge < powerReq)
-		icon_state = "trackerEmpty"
+/obj/machinery/computer/shuttle/auxillary_base/New(location, obj/item/weapon/circuitboard/computer/shuttle/C)
 	..()
-/obj/item/device/t_scanner/motionTracker/scan(mob/living/carbon/user)
-	if(!on_cooldown)
-		on_cooldown = 1
-		spawn(cooldown)
-			on_cooldown = 0
-		var/turf/t = get_turf(src)
-		var/list/mobs = recursive_mob_check(t, 1,0,0)
-		if(!mobs.len)
+	locator = new /obj/item/device/gps/internal/base(src)
+
+/obj/machinery/computer/shuttle/auxillary_base/Topic(href, href_list)
+	if(href_list["move"])
+		if(z != ZLEVEL_STATION && shuttleId == "colony_drop")
+			usr << "<span class='warning'>You can't move the base again!</span>"
+			return 0
+		if(launch_warning)
+			say("<span class='danger'>Launch sequence activated! Prepare for drop!</span>")
+			playsound(loc, 'sound/machines/warning-buzzer.ogg', 70, 0)
+			launch_warning = FALSE
+	..()
+
+
+
+/obj/machinery/computer/shuttle/auxillary_base/onShuttleMove(turf/T1, rotation)
+	..()
+	if(z == ZLEVEL_MINING) //Avoids double logging and landing on other Z-levels due to badminnery
+		feedback_add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped!
+
+/obj/machinery/computer/shuttle/auxillary_base/proc/set_mining_mode()
+	if(z == ZLEVEL_MINING) //The console switches to controlling the mining shuttle once landed.
+		req_access = list()
+		shuttleId = "mining" //The base can only be dropped once, so this gives the console a new purpose.
+		possible_destinations = "mining_home;mining_away;landing_zone_dock"
+
+/obj/item/device/assault_pod/mining
+	name = "Landing Field Designator"
+	icon_state = "gangtool-purple"
+	item_state = "electronic"
+	icon = 'icons/obj/device.dmi'
+	desc = "Deploy to designate the landing zone of the auxillary base."
+	w_class = WEIGHT_CLASS_SMALL
+	shuttle_id = "colony_drop"
+	var/setting = FALSE
+	var/no_restrictions = FALSE //Badmin variable to let you drop the colony ANYWHERE.
+
+/obj/item/device/assault_pod/mining/attack_self(mob/living/user)
+	if(setting)
+		return
+	var/turf/T = get_turf(user)
+	var/obj/docking_port/mobile/auxillary_base/base_dock = locate(/obj/docking_port/mobile/auxillary_base) in SSshuttle.mobile
+	if(!base_dock) //Not all maps have an Aux base. This object is useless in that case.
+		user << "<span class='warning'>This station is not equipped with an auxillary base. Please contact your Nanotrasen contractor.</span>"
+		return
+	if(!no_restrictions)
+		if(T.z != ZLEVEL_MINING)
+			user << "Wouldn't do much good dropping a mining base away from the mining area!"
 			return
-		motionTrackScan(mobs, range)
+		var/colony_radius = max(width, height)*0.5
+		var/list/area_counter = get_areas_in_range(colony_radius, T)
+		if(area_counter.len > 1) //Avoid smashing ruins unless you are inside a really big one
+			user << "Unable to acquire a targeting lock. Find an area clear of stuctures or entirely within one."
+			return
+
+	user << "<span class='notice'>You begin setting the landing zone parameters...</span>"
+	setting = TRUE
+	if(!do_after(user, 50, target = user)) //You get a few seconds to cancel if you do not want to drop there.
+		setting = FALSE
+		return
+
+	var/area/A = get_area(T)
+
+	var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T)
+	landing_zone.id = "colony_drop(\ref[src])"
+	landing_zone.name = "Landing Zone ([T.x], [T.y])"
+	landing_zone.dwidth = base_dock.dwidth
+	landing_zone.dheight = base_dock.dheight
+	landing_zone.width = base_dock.width
+	landing_zone.height = base_dock.height
+	landing_zone.setDir(base_dock.dir)
+	landing_zone.turf_type = T.type
+	landing_zone.area_type = A.type
+
+	for(var/obj/machinery/computer/shuttle/S in machines)
+		if(S.shuttleId == shuttle_id)
+			S.possible_destinations += "[landing_zone.id];"
+
+//Serves as a nice mechanic to people get ready for the launch.
+	minor_announce("Auxiliary base landing zone coordinates locked in for [get_area(user)]. Launch command now available!")
+	user << "<span class='notice'>Landing zone set.</span>"
+
+	qdel(src)
+
+/obj/item/device/assault_pod/mining/unrestricted
+	name = "omni-locational landing field designator"
+	desc = "Allows the deployment of the mining base ANYWHERE. Use with caution."
+	no_restrictions = TRUE
 
 
-/obj/item/device/t_scanner/motionTracker/proc/motionTrackScan(var/list/mobs, var/range)
-	var/mobsfar = 0
-	for(var/turf/T in range(7, get_turf(src)) )
-		for(var/mob/O in T.contents)
-			var/mob/living/L = locate() in T
-			if(L && (get_turf(L) != get_turf(src)) && !L.stat)
-				flick_blip(O.loc)
-				mobsfar = 1
-	if(mobsfar)
-		playsound(get_turf(src),'sound/effects/trackFull.ogg', 15, 0, -5)
-	if(!mobsfar)
-		playsound(get_turf(src),'sound/effects/trackHalf.ogg', 10, 0, -5)
+/obj/docking_port/mobile/auxillary_base
+	name = "auxillary base"
+	id = "colony_drop"
+	//Reminder to map-makers to set these values equal to the size of your base.
+	dheight = 4
+	dwidth = 4
+	width = 9
+	height = 9
+	var/anti_spam_cd = 0
 
 
-/obj/item/device/t_scanner/motionTracker/proc/flick_blip(turf/T)
-	var/image/B = image('icons/obj/mining.dmi', T, icon_state = "blip")
-	var/list/nearby = list()
-	for(var/mob/M in viewers(T))
-		if(M.client)
-			nearby |= M.client
-			flick_overlay(B,nearby, 8)
+/obj/structure/mining_shuttle_beacon
+	name = "mining shuttle beacon"
+	desc = "A bluespace beacon calibrated to mark a landing spot for the mining shuttle when deployed near the auxillary mining base."
+	anchored = 0
+	density = 0
+	var/shuttle_ID = "landing_zone_dock"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "miningbeacon"
+	var/obj/docking_port/stationary/Mport //Linked docking port for the mining shuttle
+	pressure_resistance = 200 //So it does not get blown into lava.
+	var/anti_spam_cd = 0 //The linking process might be a bit intensive, so this here to prevent over use.
+	var/console_range = 15 //Wifi range of the beacon to find the aux base console
 
-/obj/item/device/t_scanner/motionTracker/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/screwdriver) && cell)
-		user << text("<span class='notice'>You detach [cell] from [src].</span>")
-		cell.loc = get_turf(src)
-		cell = null
-		cellcharge = 0
-		cellmaxcharge = 0
-		if(on)
-			on = 0
-		updateicon()
-		cell.updateicon()
-	if(istype(I, /obj/item/weapon/stock_parts/cell))
-		if(cell)
-			user << text("<span class='notice'>[src] already has a power supply installed.</span>")
-		else
-			if(!user.drop_item())//This is dumb. You should be able to move a held object without having to drop it.
-				return
-			I.loc = src
-			cell = I
-			user.visible_message(\
-				"[user.name] has inserted the power cell into [src.name].",\
-				"<span class='notice'>You install [cell.name] into [src]</span>")
-			cellcharge = cell.charge
-			cellmaxcharge = cell.maxcharge
-			updateicon()
-	else
-		..()
+/obj/structure/mining_shuttle_beacon/attack_hand(mob/user)
+	if(anchored)
+		user << "<span class='warning'>Landing zone already set.</span>"
+		return
 
-/obj/item/device/t_scanner/motionTracker/examine(mob/user)
-	..()
-	if(cell)
-		user << text("<span class='notice'>[src] has [cellcharge]/[cellmaxcharge] charge remaining.</span>")
-	else
-		user << text("<span class='notice'>[src] has no power supply installed.</span>")
+	if(anti_spam_cd)
+		user << "<span class='warning'>[src] is currently recalibrating. Please wait.</span>"
+		return
+
+	anti_spam_cd = 1
+	addtimer(src, "clear_cooldown", 100)
+
+	var/turf/landing_spot = get_turf(src)
+
+	if(landing_spot.z != ZLEVEL_MINING)
+		user << "<span class='warning'>This device is only to be used in a mining zone.</span>"
+		return
+	var/obj/machinery/computer/shuttle/auxillary_base/aux_base_console = locate(/obj/machinery/computer/shuttle/auxillary_base) in machines
+	if(!aux_base_console || get_dist(landing_spot, aux_base_console) > console_range)
+		user << "<span class='warning'>The auxillary base's console must be within [console_range] meters in order to interface.</span>"
+		return //Needs to be near the base to serve as its dock and configure it to control the mining shuttle.
+
+//Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly.
+
+
+	for(var/S in SSshuttle.stationary)
+		var/obj/docking_port/stationary/SM = S //SM is declared outside so it can be checked for null
+		if(SM.id == "mining_home" || SM.id == "mining_away")
+
+			var/area/A = get_area(landing_spot)
+
+			Mport = new(landing_spot)
+			Mport.id = "landing_zone_dock"
+			Mport.name = "auxillary base landing site"
+			Mport.dwidth = SM.dwidth
+			Mport.dheight = SM.dheight
+			Mport.width = SM.width
+			Mport.height = SM.height
+			Mport.setDir(dir)
+			Mport.turf_type = landing_spot.type
+			Mport.area_type = A.type
+
+			break
+	if(!Mport)
+		user << "<span class='warning'>This station is not equipped with an approprite mining shuttle. Please contact Nanotrasen Support.</span>"
+		return
+	var/search_radius = max(Mport.width, Mport.height)*0.5
+	var/list/landing_areas = get_areas_in_range(search_radius, landing_spot)
+	for(var/area/shuttle/auxillary_base/AB in landing_areas) //You land NEAR the base, not IN it.
+		user << "<span class='warning'>The mining shuttle must not land within the mining base itself.</span>"
+		SSshuttle.stationary.Remove(Mport)
+		qdel(Mport)
+		return
+	var/obj/docking_port/mobile/mining_shuttle
+	for(var/S in SSshuttle.mobile)
+		var/obj/docking_port/mobile/MS = S
+		if(MS.id != "mining")
+			continue
+		mining_shuttle = MS
+
+	if(!mining_shuttle) //Not having a mining shuttle is a map issue
+		user << "<span class='warning'>No mining shuttle signal detected. Please contact Nanotrasen Support.</span>"
+		SSshuttle.stationary.Remove(Mport)
+		qdel(Mport)
+		return
+
+	if(!mining_shuttle.canDock(Mport))
+		user << "<span class='warning'>Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.</span>"
+		SSshuttle.stationary.Remove(Mport)
+		qdel(Mport)
+		return
+
+	aux_base_console.set_mining_mode() //Lets the colony park the shuttle there, now that it has a dock.
+	user << "<span class='notice'>Mining shuttle calibration successful! Shuttle interface available at base console.</span>"
+	anchored = 1 //Locks in place to mark the landing zone.
+	playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+
+/obj/structure/mining_shuttle_beacon/proc/clear_cooldown()
+	anti_spam_cd = 0
+
+/obj/structure/mining_shuttle_beacon/attack_robot(mob/user)
+	return (attack_hand(user)) //So borgies can help

code/modules/mining/mine_turfs.dm

@@ -1,807 +0,0 @@
-/**********************Mineral deposits**************************/
-
-/turf/closed/mineral //wall piece
-	name = "rock"
-	icon = 'icons/turf/mining.dmi'
-	icon_state = "rock"
-	var/smooth_icon = 'icons/turf/smoothrocks.dmi'
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	canSmoothWith = list (/turf/closed/mineral, /turf/closed/wall)
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	initial_gas_mix = "TEMP=2.7"
-	opacity = 1
-	density = 1
-	blocks_air = 1
-	layer = EDGED_TURF_LAYER
-	temperature = TCMB
-	var/environment_type = "asteroid"
-	var/turf/open/floor/plating/turf_type = /turf/open/floor/plating/asteroid/airless
-	var/mineralType = null
-	var/mineralAmt = 3
-	var/spread = 0 //will the seam spread?
-	var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
-	var/last_act = 0
-	var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
-	var/defer_change = 0
-
-/turf/closed/mineral/New()
-	pixel_y = -4
-	pixel_x = -4
-	icon = smooth_icon
-	..()
-	if (mineralType && mineralAmt && spread && spreadChance)
-		for(var/dir in cardinal)
-			if(prob(spreadChance))
-				var/turf/T = get_step(src, dir)
-				if(istype(T, /turf/closed/mineral/random))
-					Spread(T)
-
-/turf/closed/mineral/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt
-	baseturf = /turf/open/floor/plating/asteroid/basalt
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-
-/turf/closed/mineral/ex_act(severity, target)
-	..()
-	switch(severity)
-		if(3)
-			if (prob(75))
-				src.gets_drilled(null, 1)
-		if(2)
-			if (prob(90))
-				src.gets_drilled(null, 1)
-		if(1)
-			src.gets_drilled(null, 1)
-	return
-
-/turf/closed/mineral/Spread(turf/T)
-	new src.type(T)
-
-/turf/closed/mineral/random
-	var/mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
-		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40,
-		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
-		//Currently, Adamantine won't spawn as it has no uses. -Durandan
-	var/mineralChance = 13
-
-/turf/closed/mineral/random/New()
-	..()
-
-	if (prob(mineralChance))
-		var/path = pickweight(mineralSpawnChanceList)
-		var/turf/T = new path(src)
-
-		if(T && istype(T, /turf/closed/mineral))
-			var/turf/closed/mineral/M = T
-			M.mineralAmt = rand(1, 5)
-			M.environment_type = src.environment_type
-			M.turf_type = src.turf_type
-			M.baseturf = src.baseturf
-			src = M
-			M.levelupdate()
-
-/turf/closed/mineral/random/high_chance
-	icon_state = "rock_highchance"
-	mineralChance = 25
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/gold = 45,
-		/turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bscrystal = 20)
-
-/turf/closed/mineral/random/high_chance/New()
-	icon_state = "rock"
-	..()
-
-/turf/closed/mineral/random/low_chance
-	icon_state = "rock_lowchance"
-	mineralChance = 6
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4,
-		/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
-		/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
-
-/turf/closed/mineral/random/low_chance/New()
-	icon_state = "rock"
-	..()
-
-/turf/closed/mineral/iron
-	mineralType = /obj/item/weapon/ore/iron
-	spreadChance = 20
-	spread = 1
-	scan_state = "rock_Iron"
-
-/turf/closed/mineral/uranium
-	mineralType = /obj/item/weapon/ore/uranium
-	spreadChance = 5
-	spread = 1
-	scan_state = "rock_Uranium"
-
-/turf/closed/mineral/diamond
-	mineralType = /obj/item/weapon/ore/diamond
-	spreadChance = 0
-	spread = 1
-	scan_state = "rock_Diamond"
-
-/turf/closed/mineral/gold
-	mineralType = /obj/item/weapon/ore/gold
-	spreadChance = 5
-	spread = 1
-	scan_state = "rock_Gold"
-
-/turf/closed/mineral/silver
-	mineralType = /obj/item/weapon/ore/silver
-	spreadChance = 5
-	spread = 1
-	scan_state = "rock_Silver"
-
-/turf/closed/mineral/plasma
-	mineralType = /obj/item/weapon/ore/plasma
-	spreadChance = 8
-	spread = 1
-	scan_state = "rock_Plasma"
-
-/turf/closed/mineral/clown
-	mineralType = /obj/item/weapon/ore/bananium
-	mineralAmt = 3
-	spreadChance = 0
-	spread = 0
-	scan_state = "rock_Clown"
-
-/turf/closed/mineral/bscrystal
-	mineralType = /obj/item/weapon/ore/bluespace_crystal
-	mineralAmt = 1
-	spreadChance = 0
-	spread = 0
-	scan_state = "rock_BScrystal"
-
-////////////////////////////////Gibtonite
-/turf/closed/mineral/gibtonite
-	mineralAmt = 1
-	spreadChance = 0
-	spread = 0
-	scan_state = "rock_Gibtonite"
-	var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it
-	var/stage = 0 //How far into the lifecycle of gibtonite we are, 0 is untouched, 1 is active and attempting to detonate, 2 is benign and ready for extraction
-	var/activated_ckey = null //These are to track who triggered the gibtonite deposit for logging purposes
-	var/activated_name = null
-	var/activated_image = null
-
-/turf/closed/mineral/gibtonite/New()
-	det_time = rand(8,10) //So you don't know exactly when the hot potato will explode
-	..()
-
-/turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)
-		user.visible_message("<span class='notice'>[user] holds [I] to [src]...</span>", "<span class='notice'>You use [I] to locate where to cut off the chain reaction and attempt to stop it...</span>")
-		defuse()
-	..()
-
-/turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
-	if(stage == 0)
-		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_active", layer = ON_EDGED_TURF_LAYER)
-		add_overlay(I)
-		activated_image = I
-		name = "gibtonite deposit"
-		desc = "An active gibtonite reserve. Run!"
-		stage = 1
-		visible_message("<span class='danger'>There was gibtonite inside! It's going to explode!</span>")
-		var/turf/bombturf = get_turf(src)
-		var/area/A = get_area(bombturf)
-
-		var/notify_admins = 0
-		if(z != 5)
-			notify_admins = 1
-			if(!triggered_by_explosion)
-				message_admins("[key_name_admin(user)]<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) has triggered a gibtonite deposit reaction at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
-			else
-				message_admins("An explosion has triggered a gibtonite deposit reaction at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
-
-		if(!triggered_by_explosion)
-			log_game("[key_name(user)] has triggered a gibtonite deposit reaction at [A.name] ([A.x], [A.y], [A.z]).")
-		else
-			log_game("An explosion has triggered a gibtonite deposit reaction at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
-
-		countdown(notify_admins)
-
-/turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0)
-	set waitfor = 0
-	while(istype(src, /turf/closed/mineral/gibtonite) && stage == 1 && det_time > 0 && mineralAmt >= 1)
-		det_time--
-		sleep(5)
-	if(istype(src, /turf/closed/mineral/gibtonite))
-		if(stage == 1 && det_time <= 0 && mineralAmt >= 1)
-			var/turf/bombturf = get_turf(src)
-			mineralAmt = 0
-			stage = 3
-			explosion(bombturf,1,3,5, adminlog = notify_admins)
-
-/turf/closed/mineral/gibtonite/proc/defuse()
-	if(stage == 1)
-		overlays -= activated_image
-		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = ON_EDGED_TURF_LAYER)
-		add_overlay(I)
-		desc = "An inactive gibtonite reserve. The ore can be extracted."
-		stage = 2
-		if(det_time < 0)
-			det_time = 0
-		visible_message("<span class='notice'>The chain reaction was stopped! The gibtonite had [src.det_time] reactions left till the explosion!</span>")
-
-/turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0)
-	if(stage == 0 && mineralAmt >= 1) //Gibtonite deposit is activated
-		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
-		explosive_reaction(user, triggered_by_explosion)
-		return
-	if(stage == 1 && mineralAmt >= 1) //Gibtonite deposit goes kaboom
-		var/turf/bombturf = get_turf(src)
-		mineralAmt = 0
-		stage = 3
-		explosion(bombturf,1,2,5, adminlog = 0)
-	if(stage == 2) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
-		var/obj/item/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src)
-		if(det_time <= 0)
-			G.quality = 3
-			G.icon_state = "Gibtonite ore 3"
-		if(det_time >= 1 && det_time <= 2)
-			G.quality = 2
-			G.icon_state = "Gibtonite ore 2"
-
-	ChangeTurf(turf_type, defer_change)
-	spawn(10)
-		AfterChange()
-
-/turf/closed/mineral/gibtonite/volcanic
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-
-////////////////////////////////End Gibtonite
-
-/turf/open/floor/plating/asteroid/airless/cave
-	var/length = 100
-	var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
-	var/sanity = 1
-	turf_type = /turf/open/floor/plating/asteroid/airless
-
-/turf/open/floor/plating/asteroid/airless/cave/volcanic
-	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 10, /mob/living/simple_animal/hostile/asteroid/goliath/beast = 50, /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 40, /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 30,
-		/mob/living/simple_animal/hostile/spawner/lavaland = 2, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
-		/mob/living/simple_animal/hostile/megafauna/dragon = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 2, /mob/living/simple_animal/hostile/megafauna/colossus = 2)
-
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-
-/turf/open/floor/plating/asteroid/airless/cave/New(loc, length, go_backwards = 1, exclude_dir = -1)
-	// If length (arg2) isn't defined, get a random length; otherwise assign our length to the length arg.
-	if(!length)
-		src.length = rand(25, 50)
-	else
-		src.length = length
-
-	// Get our directiosn
-	var/forward_cave_dir = pick(alldirs - exclude_dir)
-	// Get the opposite direction of our facing direction
-	var/backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
-
-	// Make our tunnels
-	make_tunnel(forward_cave_dir)
-	if(go_backwards)
-		make_tunnel(backward_cave_dir)
-	// Kill ourselves by replacing ourselves with a normal floor.
-	SpawnFloor(src)
-	..()
-
-/turf/open/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir)
-
-	var/turf/closed/mineral/tunnel = src
-	var/next_angle = pick(45, -45)
-
-	for(var/i = 0; i < length; i++)
-		if(!sanity)
-			break
-
-		var/list/L = list(45)
-		if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
-			L += -45
-
-		// Expand the edges of our tunnel
-		for(var/edge_angle in L)
-			var/turf/closed/mineral/edge = get_step(tunnel, angle2dir(dir2angle(dir) + edge_angle))
-			if(istype(edge))
-				SpawnFloor(edge)
-
-		// Move our tunnel forward
-		tunnel = get_step(tunnel, dir)
-
-		if(istype(tunnel))
-			// Small chance to have forks in our tunnel; otherwise dig our tunnel.
-			if(i > 3 && prob(20))
-				new src.type(tunnel, rand(10, 15), 0, dir)
-			else
-				SpawnFloor(tunnel)
-		else //if(!istype(tunnel, src.parent)) // We hit space/normal/wall, stop our tunnel.
-			break
-
-		// Chance to change our direction left or right.
-		if(i > 2 && prob(33))
-			// We can't go a full loop though
-			next_angle = -next_angle
-			setDir(angle2dir(dir2angle(dir) )+ next_angle)
-
-
-/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T)
-	for(var/turf/S in range(2,T))
-		if(istype(S, /turf/open/space) || istype(S.loc, /area/mine/explored))
-			sanity = 0
-			break
-	if(!sanity)
-		return
-
-	SpawnMonster(T)
-	new turf_type(T)
-/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T)
-	if(prob(30))
-		if(istype(loc, /area/mine/explored))
-			return
-		for(var/atom/A in urange(12,T))//Lowers chance of mob clumps
-			if(istype(A, /mob/living/simple_animal/hostile/asteroid))
-				return
-		var/randumb = pickweight(mob_spawn_list)
-		new randumb(T)
-	return
-
-/turf/closed/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params)
-
-	if (!user.IsAdvancedToolUser())
-		usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
-		return
-
-	if (istype(P, /obj/item/weapon/pickaxe))
-		var/turf/T = user.loc
-		if (!( istype(T, /turf) ))
-			return
-
-		if(last_act+P.digspeed > world.time)//prevents message spam
-			return
-		last_act = world.time
-		user << "<span class='notice'>You start picking...</span>"
-		P.playDigSound()
-
-		if(do_after(user,P.digspeed, target = src))
-			if(istype(src, /turf/closed/mineral))
-				user << "<span class='notice'>You finish cutting into the rock.</span>"
-				gets_drilled(user)
-				feedback_add_details("pick_used_mining","[P.type]")
-	else
-		return attack_hand(user)
-	return
-
-/turf/closed/mineral/proc/gets_drilled()
-	if (mineralType && (src.mineralAmt > 0) && (src.mineralAmt < 11))
-		var/i
-		for (i=0;i<mineralAmt;i++)
-			new mineralType(src)
-		feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
-	ChangeTurf(turf_type, defer_change)
-	spawn(10)
-		AfterChange()
-	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
-	return
-
-/turf/closed/mineral/attack_animal(mob/living/simple_animal/user)
-	if(user.environment_smash >= 2)
-		gets_drilled()
-	..()
-
-/turf/closed/mineral/attack_alien(mob/living/carbon/alien/M)
-	M << "<span class='notice'>You start digging into the rock...</span>"
-	playsound(src, 'sound/effects/break_stone.ogg', 50, 1)
-	if(do_after(M,40, target = src))
-		M << "<span class='notice'>You tunnel into the rock.</span>"
-		gets_drilled(M)
-
-/turf/closed/mineral/Bumped(AM as mob|obj)
-	..()
-	if(istype(AM,/mob/living/carbon/human))
-		var/mob/living/carbon/human/H = AM
-		if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
-			src.attackby(H.l_hand,H)
-		else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
-			src.attackby(H.r_hand,H)
-		return
-	else if(istype(AM,/mob/living/silicon/robot))
-		var/mob/living/silicon/robot/R = AM
-		if(istype(R.module_active,/obj/item/weapon/pickaxe))
-			src.attackby(R.module_active,R)
-			return
-/*	else if(istype(AM,/obj/mecha))
-		var/obj/mecha/M = AM
-		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
-			src.attackby(M.selected,M)
-			return*/
-//Aparantly mechs are just TOO COOL to call Bump(), so fuck em (for now)
-	else
-		return
-
-/**********************Asteroid**************************/
-
-/turf/open/floor/plating/asteroid //floor piece
-	name = "asteroid sand"
-	baseturf = /turf/open/floor/plating/asteroid
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "asteroid"
-	icon_plating = "asteroid"
-	var/environment_type = "asteroid"
-	var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
-	var/dug = 0       //0 = has not yet been dug, 1 = has already been dug
-	var/sand_type = /obj/item/weapon/ore/glass
-
-/turf/open/floor/plating/asteroid/airless
-	initial_gas_mix = "TEMP=2.7"
-	turf_type = /turf/open/floor/plating/asteroid/airless
-
-/turf/open/floor/plating/asteroid/basalt
-	name = "volcanic floor"
-	baseturf = /turf/open/floor/plating/asteroid/basalt
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "basalt"
-	icon_plating = "basalt"
-	environment_type = "basalt"
-	sand_type = /obj/item/weapon/ore/glass/basalt
-
-/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
-	baseturf = /turf/open/floor/plating/lava/smooth
-
-/turf/open/floor/plating/asteroid/basalt/airless
-	initial_gas_mix = "TEMP=2.7"
-
-/turf/open/floor/plating/asteroid/snow
-	name = "snow"
-	desc = "Looks cold."
-	icon = 'icons/turf/snow.dmi'
-	baseturf = /turf/open/floor/plating/asteroid/snow
-	icon_state = "snow"
-	icon_plating = "snow"
-	initial_gas_mix = "TEMP=180"
-	slowdown = 2
-	environment_type = "snow"
-	sand_type = /obj/item/stack/sheet/mineral/snow
-
-/turf/open/floor/plating/asteroid/snow/airless
-	initial_gas_mix = "TEMP=2.7"
-
-/turf/open/floor/plating/asteroid/snow/temperatre
-	initial_gas_mix = "TEMP=255.37"
-
-/turf/open/floor/plating/asteroid/New()
-	var/proper_name = name
-	..()
-	name = proper_name
-	if(prob(20))
-		icon_state = "[environment_type][rand(0,12)]"
-
-/turf/open/floor/plating/asteroid/burn_tile()
-	return
-
-/turf/open/floor/plating/asteroid/ex_act(severity, target)
-	contents_explosion(severity, target)
-	switch(severity)
-		if(3)
-			return
-		if(2)
-			if (prob(20))
-				src.gets_dug()
-		if(1)
-			src.gets_dug()
-	return
-
-/turf/open/floor/plating/asteroid/attackby(obj/item/weapon/W, mob/user, params)
-	//note that this proc does not call ..()
-	if(!W || !user)
-		return 0
-	var/digging_speed = 0
-	if (istype(W, /obj/item/weapon/shovel))
-		var/obj/item/weapon/shovel/S = W
-		digging_speed = S.digspeed
-	else if (istype(W, /obj/item/weapon/pickaxe))
-		var/obj/item/weapon/pickaxe/P = W
-		digging_speed = P.digspeed
-	if (digging_speed)
-		var/turf/T = user.loc
-		if (!( istype(T, /turf) ))
-			return
-
-		if (dug)
-			user << "<span class='warning'>This area has already been dug!</span>"
-			return
-
-		user << "<span class='notice'>You start digging...</span>"
-		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
-
-		if(do_after(user, digging_speed, target = src))
-			if(istype(src, /turf/open/floor/plating/asteroid))
-				user << "<span class='notice'>You dig a hole.</span>"
-				gets_dug()
-				feedback_add_details("pick_used_mining","[W.type]")
-
-	if(istype(W,/obj/item/weapon/storage/bag/ore))
-		var/obj/item/weapon/storage/bag/ore/S = W
-		if(S.collection_mode == 1)
-			for(var/obj/item/weapon/ore/O in src.contents)
-				O.attackby(W,user)
-				return
-
-	if(istype(W, /obj/item/stack/tile))
-		var/obj/item/stack/tile/Z = W
-		if(!Z.use(1))
-			return
-		var/turf/open/floor/T = ChangeTurf(Z.turf_type)
-		if(istype(Z,/obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
-			var/obj/item/stack/tile/light/L = Z
-			var/turf/open/floor/light/F = T
-			F.state = L.state
-		playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
-
-/turf/open/floor/plating/asteroid/proc/gets_dug()
-	if(dug)
-		return
-	for(var/i in 1 to 5)
-		new sand_type(src)
-	dug = 1
-	icon_plating = "[environment_type]_dug"
-	icon_state = "[environment_type]_dug"
-	slowdown = 0
-	return
-
-/turf/open/floor/plating/asteroid/singularity_act()
-	return
-
-/turf/open/floor/plating/asteroid/singularity_pull(S, current_size)
-	return
-
-//////////////CHASM//////////////////
-
-/turf/open/chasm
-	name = "chasm"
-	desc = "Watch your step."
-	baseturf = /turf/open/chasm
-	smooth = SMOOTH_TRUE | SMOOTH_BORDER
-	icon = 'icons/turf/floors/Chasms.dmi'
-	icon_state = "smooth"
-	var/drop_x = 1
-	var/drop_y = 1
-	var/drop_z = 1
-
-
-/turf/open/chasm/Entered(atom/movable/AM)
-	if(istype(AM, /obj/singularity) || istype(AM, /obj/item/projectile))
-		return
-	if(istype(AM, /obj/effect/portal))
-		// Portals aren't affected by gravity. Probably.
-		return
-	// Flies right over the chasm
-	if(istype(AM, /mob/living/simple_animal))
-		// apparently only simple_animals can fly??
-		var/mob/living/simple_animal/SA = AM
-		if(SA.flying)
-			return
-	if(istype(AM, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = AM
-		if(istype(H.belt, /obj/item/device/wormhole_jaunter))
-			var/obj/item/device/wormhole_jaunter/J = H.belt
-			// To freak out any bystanders
-			visible_message("<span class='boldwarning'>[H] falls into [src]!</span>")
-			J.chasm_react(H)
-			return
-		if(H.dna.species && (FLYING in H.dna.species.specflags))
-			return
-	drop(AM)
-
-
-/turf/open/chasm/proc/drop(atom/movable/AM)
-	/*visible_message("[AM] falls into [src]!")
-	qdel(AM)*/
-	AM.forceMove(locate(drop_x, drop_y, drop_z))
-	AM.visible_message("<span class='boldwarning'>[AM] falls from above!</span>", "<span class='userdanger'>GAH! Ah... where are you?</span>")
-	if(istype(AM, /mob/living))
-		var/mob/living/L = AM
-		L.Weaken(5)
-		L.adjustBruteLoss(30)
-
-/turf/open/chasm/straight_down/New()
-	..()
-	drop_x = x
-	drop_y = y
-	if(z+1 <= world.maxz)
-		drop_z = z+1
-
-/**********************Lavaland Turfs**************************/
-
-///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
-
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	planetary_atmos = TRUE
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-
-/turf/open/chasm/straight_down/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	planetary_atmos = TRUE
-	baseturf = /turf/open/chasm/straight_down/lava_land_surface
-
-/turf/open/chasm/straight_down/lava_land_surface/drop(atom/movable/AM)
-	if(!AM.invisibility)
-		AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>You stumble and stare into an abyss before you. It stares back, and you fall \
-		into the enveloping dark.</span>")
-		if(isliving(AM))
-			var/mob/living/L = AM
-			L.notransform = TRUE
-			L.Stun(10)
-			L.resting = TRUE
-		animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10)
-		for(var/i in 1 to 5)
-			AM.pixel_y--
-			sleep(2)
-		if(isrobot(AM))
-			var/mob/living/silicon/robot/S = AM
-			qdel(S.mmi)
-		qdel(AM)
-
-/turf/closed/mineral/volcanic/lava_land_surface
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	defer_change = 1
-
-/turf/closed/mineral/random/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-	mineralChance = 10
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 5, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 10,
-		/turf/closed/mineral/silver/volcanic = 12, /turf/closed/mineral/plasma/volcanic = 20, /turf/closed/mineral/iron/volcanic = 40,
-		/turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 1, /turf/closed/mineral/bscrystal/volcanic = 1)
-
-/turf/closed/mineral/random/high_chance/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 35, /turf/closed/mineral/diamond/volcanic = 30, /turf/closed/mineral/gold/volcanic = 45,
-		/turf/closed/mineral/silver/volcanic = 50, /turf/closed/mineral/plasma/volcanic = 50, /turf/closed/mineral/bscrystal/volcanic = 20)
-
-/turf/open/floor/plating/lava/smooth/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	planetary_atmos = TRUE
-	baseturf = /turf/open/chasm/straight_down/lava_land_surface
-
-/turf/closed/mineral/gibtonite/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/uranium/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/diamond/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/gold/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/silver/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/plasma/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/iron/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-/turf/closed/mineral/bscrystal/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	defer_change = 1
-
-
-//BECAUSE ONE PLANET WASNT ENOUGH
-
-/turf/closed/mineral/ash_rock //wall piece
-	name = "rock"
-	icon = 'icons/turf/mining.dmi'
-	smooth_icon = 'icons/turf/walls/rock_wall.dmi'
-	icon_state = "rock"
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	canSmoothWith = list (/turf/closed/mineral, /turf/closed/wall)
-	baseturf = /turf/open/floor/plating/ash
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	environment_type = "waste"
-	turf_type = /turf/open/floor/plating/ash
-	defer_change = 1
-
-/turf/open/floor/plating/ash
-	icon = 'icons/turf/mining.dmi'
-	name = "ash"
-	icon_state = "ash"
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	canSmoothWith = list (/turf/open/floor/plating/ash, /turf/closed)
-	var/smooth_icon = 'icons/turf/floors/ash.dmi'
-	desc = "The ground is covered in volcanic ash."
-	baseturf = /turf/open/floor/plating/ash //I assume this will be a chasm eventually, once this becomes an actual surface
-	slowdown = 1
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	planetary_atmos = TRUE
-
-/turf/open/floor/plating/ash/New()
-	pixel_y = -4
-	pixel_x = -4
-	icon = smooth_icon
-	..()
-
-/turf/open/floor/plating/ash/break_tile()
-	return
-
-/turf/open/floor/plating/ash/burn_tile()
-	return
-
-/turf/open/floor/plating/ash/rocky
-	name = "rocky ground"
-	icon_state = "rockyash"
-	icon = 'icons/turf/mining.dmi'
-	smooth_icon = 'icons/turf/floors/rocky_ash.dmi'
-	slowdown = 0
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	canSmoothWith = list (/turf/open/floor/plating/ash/rocky, /turf/closed)
-
-//Necropolis
-
-/turf/closed/indestructible/necropolis
-	name = "necropolis wall"
-	desc = "A seemingly impenetrable wall."
-	icon = 'icons/turf/walls.dmi'
-	explosion_block = 50
-	baseturf = /turf/closed/indestructible/necropolis
-
-/turf/open/indestructible/necropolis
-	name = "necropolis floor"
-	desc = "It's regarding you suspiciously."
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "floor"
-	baseturf = /turf/open/indestructible/necropolis
-
-/turf/open/indestructible/necropolis/New()
-	..()
-	if(prob(12))
-		icon_state = "necropolis[rand(1,2)]"

code/modules/mining/minebot.dm

@@ -1,4 +1,6 @@
 /**********************Mining drone**********************/
+#define MINEDRONE_COLLECT 1
+#define MINEDRONE_ATTACK 2
 
 /mob/living/simple_animal/hostile/mining_drone
 	name = "nanotrasen minebot"
@@ -7,10 +9,9 @@
 	icon_state = "mining_drone"
 	icon_living = "mining_drone"
 	status_flags = CANSTUN|CANWEAKEN|CANPUSH
-	stop_automated_movement_when_pulled = 1
 	mouse_opacity = 1
 	faction = list("neutral")
-	a_intent = "harm"
+	a_intent = INTENT_HARM
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	wander = 0
@@ -22,8 +23,10 @@
 	maxHealth = 125
 	melee_damage_lower = 15
 	melee_damage_upper = 15
+	obj_damage = 0
 	environment_smash = 0
 	check_friendly_fire = 1
+	stop_automated_movement_when_pulled = 1
 	attacktext = "drills"
 	attack_sound = 'sound/weapons/circsawhit.ogg'
 	ranged = 1
@@ -35,8 +38,32 @@
 	speak_emote = list("states")
 	wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
 						  /obj/item/weapon/ore/plasma,  /obj/item/weapon/ore/uranium,    /obj/item/weapon/ore/iron,
-						  /obj/item/weapon/ore/bananium)
+						  /obj/item/weapon/ore/bananium, /obj/item/weapon/ore/titanium)
 	healable = 0
+	var/mode = MINEDRONE_COLLECT
+	var/light_on = 0
+
+	var/datum/action/innate/minedrone/toggle_light/toggle_light_action
+	var/datum/action/innate/minedrone/toggle_meson_vision/toggle_meson_vision_action
+	var/datum/action/innate/minedrone/toggle_mode/toggle_mode_action
+	var/datum/action/innate/minedrone/dump_ore/dump_ore_action
+
+/mob/living/simple_animal/hostile/mining_drone/New()
+	..()
+	toggle_light_action = new()
+	toggle_light_action.Grant(src)
+	toggle_meson_vision_action = new()
+	toggle_meson_vision_action.Grant(src)
+	toggle_mode_action = new()
+	toggle_mode_action.Grant(src)
+	dump_ore_action = new()
+	dump_ore_action.Grant(src)
+
+	SetCollectBehavior()
+
+/mob/living/simple_animal/hostile/mining_drone/sentience_act()
+	AIStatus = AI_OFF
+	check_friendly_fire = 0
 
 /mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/weldingtool))
@@ -61,27 +88,23 @@
 	..()
 	visible_message("<span class='danger'>[src] is destroyed!</span>")
 	new /obj/effect/decal/cleanable/robot_debris(src.loc)
-	DropOre()
+	DropOre(0)
 	qdel(src)
 	return
 
-/mob/living/simple_animal/hostile/mining_drone/New()
-	..()
-	SetCollectBehavior()
-
 /mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M)
-	if(M.a_intent == "help")
-		switch(search_objects)
-			if(0)
-				SetCollectBehavior()
+	if(M.a_intent == INTENT_HELP)
+		toggle_mode()
+		switch(mode)
+			if(MINEDRONE_COLLECT)
 				M << "<span class='info'>[src] has been set to search and store loose ore.</span>"
-			if(2)
-				SetOffenseBehavior()
+			if(MINEDRONE_ATTACK)
 				M << "<span class='info'>[src] has been set to attack hostile wildlife.</span>"
 		return
 	..()
 
 /mob/living/simple_animal/hostile/mining_drone/proc/SetCollectBehavior()
+	mode = MINEDRONE_COLLECT
 	idle_vision_range = 9
 	search_objects = 2
 	wander = 1
@@ -89,8 +112,10 @@
 	minimum_distance = 1
 	retreat_distance = null
 	icon_state = "mining_drone"
+	src << "<span class='info'>You are set to collect mode. You can now collect loose ore.</span>"
 
 /mob/living/simple_animal/hostile/mining_drone/proc/SetOffenseBehavior()
+	mode = MINEDRONE_ATTACK
 	idle_vision_range = 7
 	search_objects = 0
 	wander = 0
@@ -98,9 +123,10 @@
 	retreat_distance = 1
 	minimum_distance = 2
 	icon_state = "mining_drone_offense"
+	src << "<span class='info'>You are set to attack mode. You can now attack from range.</span>"
 
 /mob/living/simple_animal/hostile/mining_drone/AttackingTarget()
-	if(istype(target, /obj/item/weapon/ore))
+	if(istype(target, /obj/item/weapon/ore) && mode ==  MINEDRONE_COLLECT)
 		CollectOre()
 		return
 	..()
@@ -115,19 +141,86 @@
 			O.loc = src
 	return
 
-/mob/living/simple_animal/hostile/mining_drone/proc/DropOre()
+/mob/living/simple_animal/hostile/mining_drone/proc/DropOre(message = 1)
 	if(!contents.len)
+		if(message)
+			src << "<span class='notice'>You attempt to dump your stored ore, but you have none.</span>"
 		return
+	if(message)
+		src << "<span class='notice'>You dump your stored ore.</span>"
 	for(var/obj/item/weapon/ore/O in contents)
 		contents -= O
 		O.loc = src.loc
 	return
 
-/mob/living/simple_animal/hostile/mining_drone/adjustHealth()
-	if(search_objects)
+/mob/living/simple_animal/hostile/mining_drone/adjustHealth(amount)
+	if(mode != MINEDRONE_ATTACK && amount > 0)
 		SetOffenseBehavior()
 	. = ..()
 
+/mob/living/simple_animal/hostile/mining_drone/proc/toggle_mode()
+	switch(mode)
+		if(MINEDRONE_COLLECT)
+			SetOffenseBehavior()
+		if(MINEDRONE_ATTACK)
+			SetCollectBehavior()
+		else //This should never happen.
+			mode = MINEDRONE_COLLECT
+			SetCollectBehavior()
+
+//Actions for sentient minebots
+
+/datum/action/innate/minedrone
+	check_flags = AB_CHECK_CONSCIOUS
+	background_icon_state = "bg_default"
+
+/datum/action/innate/minedrone/toggle_light
+	name = "Toggle Light"
+	button_icon_state = "mech_lights_off"
+
+/datum/action/innate/minedrone/toggle_light/Activate()
+	var/mob/living/simple_animal/hostile/mining_drone/user = owner
+
+	if(user.light_on)
+		user.AddLuminosity(-6)
+	else
+		user.AddLuminosity(6)
+	user.light_on = !user.light_on
+	user << "<span class='notice'>You toggle your light [user.light_on ? "on" : "off"].</span>"
+
+/datum/action/innate/minedrone/toggle_meson_vision
+	name = "Toggle Meson Vision"
+	button_icon_state = "meson"
+
+/datum/action/innate/minedrone/toggle_meson_vision/Activate()
+	var/mob/living/simple_animal/hostile/mining_drone/user = owner
+
+	if(user.sight & SEE_TURFS)
+		user.sight &= ~SEE_TURFS
+		user.see_invisible = SEE_INVISIBLE_LIVING
+	else
+		user.sight |= SEE_TURFS
+		user.see_invisible = SEE_INVISIBLE_MINIMUM
+
+	user << "<span class='notice'>You toggle your meson vision [(user.sight & SEE_TURFS) ? "on" : "off"].</span>"
+
+/datum/action/innate/minedrone/toggle_mode
+	name = "Toggle Mode"
+	button_icon_state = "mech_cycle_equip_off"
+
+/datum/action/innate/minedrone/toggle_mode/Activate()
+	var/mob/living/simple_animal/hostile/mining_drone/user = owner
+	user.toggle_mode()
+
+/datum/action/innate/minedrone/dump_ore
+	name = "Dump Ore"
+	button_icon_state = "mech_eject"
+
+/datum/action/innate/minedrone/dump_ore/Activate()
+	var/mob/living/simple_animal/hostile/mining_drone/user = owner
+	user.DropOre()
+
+
 /**********************Minebot Upgrades**********************/
 
 //Melee
@@ -185,4 +278,7 @@
 	icon_state = "door_electronics"
 	icon = 'icons/obj/module.dmi'
 	sentience_type = SENTIENCE_MINEBOT
-	origin_tech = "programming=6"
+	origin_tech = "programming=6"
+
+#undef MINEDRONE_COLLECT
+#undef MINEDRONE_ATTACK

code/modules/mining/mint.dm

@@ -7,110 +7,60 @@
 	icon_state = "coinpress0"
 	density = 1
 	anchored = 1
-	var/amt_silver = 0 //amount of silver
-	var/amt_gold = 0   //amount of gold
-	var/amt_diamond = 0
-	var/amt_iron = 0
-	var/amt_plasma = 0
-	var/amt_uranium = 0
-	var/amt_clown = 0
-	var/amt_adamantine = 0
-	var/amt_mythril = 0
+	var/datum/material_container/materials
 	var/newCoins = 0   //how many coins the machine made in it's last load
 	var/processing = 0
-	var/chosen = "metal" //which material will be used to make coins
+	var/chosen = MAT_METAL //which material will be used to make coins
 	var/coinsToProduce = 10
 	speed_process = 1
 
-/obj/machinery/mineral/mint/process()
-	var/turf/T = get_step(src,input_dir)
-	if(T)
-		for(var/obj/item/stack/sheet/O in T)
-			if (istype(O, /obj/item/stack/sheet/mineral/gold))
-				amt_gold += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/silver))
-				amt_silver += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/diamond))
-				amt_diamond += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/plasma))
-				amt_plasma += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/uranium))
-				amt_uranium += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/metal))
-				amt_iron += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/bananium))
-				amt_clown += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			if (istype(O, /obj/item/stack/sheet/mineral/adamantine))
-				amt_adamantine += MINERAL_MATERIAL_AMOUNT * O.amount
-				O.loc = null
-			return
 
+/obj/machinery/mineral/mint/New()
+	..()
+	materials = new /datum/material_container(src,
+		list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM),
+		max_amt = MINERAL_MATERIAL_AMOUNT*50)
+
+/obj/machinery/mineral/mint/Destroy()
+	qdel(materials)
+	materials = null
+	return ..()
+
+
+/obj/machinery/mineral/mint/process()
+	var/turf/T = get_step(src, input_dir)
+	if(!T)
+		return
+
+	for(var/obj/item/stack/sheet/O in T)
+		materials.insert_stack(O, O.amount)
 
 /obj/machinery/mineral/mint/attack_hand(mob/user)
-
 	var/dat = "<b>Coin Press</b><br>"
 
-	dat += text("<br><font color='#ffcc00'><b>Gold inserted: </b>[amt_gold] cm3</font> ")
-	if (chosen == "gold")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=gold'>Choose</A>")
-	dat += text("<br><font color='#888888'><b>Silver inserted: </b>[amt_silver] cm3</font> ")
-	if (chosen == "silver")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=silver'>Choose</A>")
-	dat += text("<br><font color='#555555'><b>Iron inserted: </b>[amt_iron] cm3</font> ")
-	if (chosen == "metal")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=metal'>Choose</A>")
-	dat += text("<br><font color='#8888FF'><b>Diamond inserted: </b>[amt_diamond] cm3</font> ")
-	if (chosen == "diamond")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=diamond'>Choose</A>")
-	dat += text("<br><font color='#FF8800'><b>Plasma inserted: </b>[amt_plasma] cm3</font> ")
-	if (chosen == "plasma")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=plasma'>Choose</A>")
-	dat += text("<br><font color='#008800'><b>Uranium inserted: </b>[amt_uranium] cm3</font> ")
-	if (chosen == "uranium")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=uranium'>Choose</A>")
-	if(amt_clown > 0)
-		dat += text("<br><font color='#AAAA00'><b>Bananium inserted: </b>[amt_clown] cm3</font> ")
-		if (chosen == "clown")
-			dat += text("chosen")
+	for(var/mat_id in materials.materials)
+		var/datum/material/M = materials.materials[mat_id]
+		if(!M.amount && chosen != mat_id)
+			continue
+		dat += "<br><b>[M.name] amount:</b> [M.amount] cm<sup>3</sup> "
+		if (chosen == mat_id)
+			dat += "<b>Chosen</b>"
 		else
-			dat += text("<A href='?src=\ref[src];choose=clown'>Choose</A>")
-	dat += text("<br><font color='#888888'><b>Adamantine inserted: </b>[amt_adamantine] cm3</font> ")//I don't even know these color codes, so fuck it.
-	if (chosen == "adamantine")
-		dat += text("chosen")
-	else
-		dat += text("<A href='?src=\ref[src];choose=adamantine'>Choose</A>")
+			dat += "<A href='?src=\ref[src];choose=[mat_id]'>Choose</A>"
 
-	dat += text("<br><br>Will produce [coinsToProduce] [chosen] coins if enough materials are available.<br>")
-	//dat += text("The dial which controls the number of conins to produce seems to be stuck. A technician has already been dispatched to fix this.")
-	dat += text("<A href='?src=\ref[src];chooseAmt=-10'>-10</A> ")
-	dat += text("<A href='?src=\ref[src];chooseAmt=-5'>-5</A> ")
-	dat += text("<A href='?src=\ref[src];chooseAmt=-1'>-1</A> ")
-	dat += text("<A href='?src=\ref[src];chooseAmt=1'>+1</A> ")
-	dat += text("<A href='?src=\ref[src];chooseAmt=5'>+5</A> ")
-	dat += text("<A href='?src=\ref[src];chooseAmt=10'>+10</A> ")
+	var/datum/material/M = materials.materials[chosen]
 
-	dat += text("<br><br>In total this machine produced <font color='green'><b>[newCoins]</b></font> coins.")
-	dat += text("<br><A href='?src=\ref[src];makeCoins=[1]'>Make coins</A>")
-	user << browse("[dat]", "window=mint")
+	dat += "<br><br>Will produce [coinsToProduce] [lowertext(M.name)] coins if enough materials are available.<br>"
+	dat += "<A href='?src=\ref[src];chooseAmt=-10'>-10</A> "
+	dat += "<A href='?src=\ref[src];chooseAmt=-5'>-5</A> "
+	dat += "<A href='?src=\ref[src];chooseAmt=-1'>-1</A> "
+	dat += "<A href='?src=\ref[src];chooseAmt=1'>+1</A> "
+	dat += "<A href='?src=\ref[src];chooseAmt=5'>+5</A> "
+	dat += "<A href='?src=\ref[src];chooseAmt=10'>+10</A> "
+
+	dat += "<br><br>In total this machine produced <font color='green'><b>[newCoins]</b></font> coins."
+	dat += "<br><A href='?src=\ref[src];makeCoins=[1]'>Make coins</A>"
+	user << browse(dat, "window=mint")
 
 /obj/machinery/mineral/mint/Topic(href, href_list)
 	if(..())
@@ -121,89 +71,29 @@
 		usr << "<span class='notice'>The machine is processing.</span>"
 		return
 	if(href_list["choose"])
-		chosen = href_list["choose"]
+		if(materials.materials[href_list["choose"]])
+			chosen = href_list["choose"]
 	if(href_list["chooseAmt"])
 		coinsToProduce = Clamp(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
 	if(href_list["makeCoins"])
 		var/temp_coins = coinsToProduce
-		processing = 1;
+		processing = 1
 		icon_state = "coinpress1"
 		var/coin_mat = MINERAL_MATERIAL_AMOUNT * 0.2
-		switch(chosen)
-			if("metal")
-				while(amt_iron >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/iron)
-					amt_iron -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("gold")
-				while(amt_gold >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/gold)
-					amt_gold -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("silver")
-				while(amt_silver >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/silver)
-					amt_silver -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("diamond")
-				while(amt_diamond >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/diamond)
-					amt_diamond -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("plasma")
-				while(amt_plasma >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/plasma)
-					amt_plasma -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("uranium")
-				while(amt_uranium >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/uranium)
-					amt_uranium -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5)
-			if("clown")
-				while(amt_clown >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/clown)
-					amt_clown -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("adamantine")
-				while(amt_adamantine >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/adamantine)
-					amt_adamantine -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
-			if("mythril")
-				while(amt_adamantine >= coin_mat && coinsToProduce > 0)
-					create_coins(/obj/item/weapon/coin/mythril)
-					amt_mythril -= coin_mat
-					coinsToProduce--
-					newCoins++
-					src.updateUsrDialog()
-					sleep(5);
+		var/datum/material/M = materials.materials[chosen]
+		if(!M || !M.coin_type)
+			updateUsrDialog()
+			return
+
+		while(coinsToProduce > 0 && materials.use_amount_type(coin_mat, chosen))
+			create_coins(M.coin_type)
+			coinsToProduce--
+			newCoins++
+			src.updateUsrDialog()
+			sleep(5)
+
 		icon_state = "coinpress0"
-		processing = 0;
+		processing = 0
 		coinsToProduce = temp_coins
 	src.updateUsrDialog()
 	return

code/modules/mining/money_bag.dm

@@ -5,10 +5,11 @@
 	icon_state = "moneybag"
 	force = 10
 	throwforce = 0
-	burn_state = FLAMMABLE
-	burntime = 20
-	w_class = 4
-	max_w_class = 3
+	resistance_flags = FLAMMABLE
+	obj_integrity = 100
+	max_integrity = 100
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
 	storage_slots = 80
 	max_combined_w_class = 40
 	can_hold = list(/obj/item/weapon/coin, /obj/item/stack/spacecash)

code/modules/mining/ores_coins.dm

@@ -17,6 +17,36 @@
 			user << "<span class='info'>Not enough fuel to smelt [src].</span>"
 	..()
 
+/obj/item/weapon/ore/Crossed(atom/movable/AM)
+	var/obj/item/weapon/storage/bag/ore/OB
+	if(istype(loc, /turf/open/floor/plating/asteroid))
+		var/turf/open/floor/plating/asteroid/F = loc
+		if(ishuman(AM))
+			var/mob/living/carbon/human/H = AM
+			for(var/thing in H.get_storage_slots())
+				if(istype(thing, /obj/item/weapon/storage/bag/ore))
+					OB = thing
+					break
+			for(var/thing in H.held_items)
+				if(istype(thing, /obj/item/weapon/storage/bag/ore))
+					OB = thing
+					break
+		else if(issilicon(AM))
+			var/mob/living/silicon/robot/R = AM
+			for(var/thing in R.module_active)
+				if(istype(thing, /obj/item/weapon/storage/bag/ore))
+					OB = thing
+					break
+		if(OB)
+			F.attackby(OB, AM)
+			// Then, if the user is dragging an ore box, empty the satchel
+			// into the box.
+			var/mob/living/L = AM
+			if(istype(L.pulling, /obj/structure/ore_box))
+				var/obj/structure/ore_box/box = L.pulling
+				box.attackby(OB, AM)
+	return ..()
+
 /obj/item/weapon/ore/uranium
 	name = "uranium ore"
 	icon_state = "Uranium ore"
@@ -40,7 +70,7 @@
 	points = 1
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/glass
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 
 /obj/item/weapon/ore/glass/attack_self(mob/living/user)
 	user << "<span class='notice'>You use the sand to make sandstone.</span>"
@@ -133,6 +163,14 @@
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/bananium
 
+/obj/item/weapon/ore/titanium
+	name = "titanium ore"
+	icon_state = "Titanium ore"
+	origin_tech = "materials=4"
+	points = 50
+	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
+	refined_type = /obj/item/stack/sheet/mineral/titanium
+
 /obj/item/weapon/ore/slag
 	name = "slag"
 	desc = "Completely useless"
@@ -144,7 +182,7 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "Gibtonite ore"
 	item_state = "Gibtonite ore"
-	w_class = 4
+	w_class = WEIGHT_CLASS_BULKY
 	throw_range = 0
 	var/primed = 0
 	var/det_time = 100
@@ -252,7 +290,7 @@
 	flags = CONDUCT
 	force = 1
 	throwforce = 2
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	var/string_attached
 	var/list/sideslist = list("heads","tails")
 	var/cmineral = null

code/modules/mining/satchel_ore_boxdm.dm

@@ -13,23 +13,18 @@
 	if (istype(W, /obj/item/weapon/ore))
 		if(!user.drop_item())
 			return
-		W.loc = src
+		W.forceMove(src)
 	else if (istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
 		for(var/obj/item/weapon/ore/O in S.contents)
 			S.remove_from_storage(O, src) //This will move the item to this item's contents
 		user << "<span class='notice'>You empty the ore in [S] into \the [src].</span>"
 	else if(istype(W, /obj/item/weapon/crowbar))
-		playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
+		playsound(loc, W.usesound, 50, 1)
 		var/obj/item/weapon/crowbar/C = W
-		var/time = 50
-		if(do_after(user, time/C.toolspeed, target = src))
+		if(do_after(user, 50*C.toolspeed, target = src))
 			user.visible_message("[user] pries \the [src] apart.", "<span class='notice'>You pry apart \the [src].</span>", "<span class='italics'>You hear splitting wood.</span>")
-			// If you change the amount of wood returned, remember
-			// to change the construction costs
-			var/obj/item/stack/sheet/mineral/wood/wo = new (loc, 4)
-			wo.add_fingerprint(user)
-			deconstruct()
+			deconstruct(TRUE, user)
 	else
 		return ..()
 
@@ -42,64 +37,19 @@
 		show_contents(user)
 
 /obj/structure/ore_box/proc/show_contents(mob/user)
-	var/amt_gold = 0
-	var/amt_silver = 0
-	var/amt_diamond = 0
-	var/amt_glass = 0
-	var/amt_iron = 0
-	var/amt_plasma = 0
-	var/amt_uranium = 0
-	var/amt_clown = 0
-	var/amt_bluespace = 0
-
-	for (var/obj/item/weapon/ore/C in contents)
-		if (istype(C,/obj/item/weapon/ore/diamond))
-			amt_diamond++;
-		if (istype(C,/obj/item/weapon/ore/glass))
-			amt_glass++;
-		if (istype(C,/obj/item/weapon/ore/plasma))
-			amt_plasma++;
-		if (istype(C,/obj/item/weapon/ore/iron))
-			amt_iron++;
-		if (istype(C,/obj/item/weapon/ore/silver))
-			amt_silver++;
-		if (istype(C,/obj/item/weapon/ore/gold))
-			amt_gold++;
-		if (istype(C,/obj/item/weapon/ore/uranium))
-			amt_uranium++;
-		if (istype(C,/obj/item/weapon/ore/bananium))
-			amt_clown++;
-		if (istype(C,/obj/item/weapon/ore/bluespace_crystal))
-			amt_bluespace++
-
 	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
-	if (amt_gold)
-		dat += text("Gold ore: [amt_gold]<br>")
-	if (amt_silver)
-		dat += text("Silver ore: [amt_silver]<br>")
-	if (amt_iron)
-		dat += text("Metal ore: [amt_iron]<br>")
-	if (amt_glass)
-		dat += text("Sand: [amt_glass]<br>")
-	if (amt_diamond)
-		dat += text("Diamond ore: [amt_diamond]<br>")
-	if (amt_plasma)
-		dat += text("Plasma ore: [amt_plasma]<br>")
-	if (amt_uranium)
-		dat += text("Uranium ore: [amt_uranium]<br>")
-	if (amt_clown)
-		dat += text("Bananium ore: [amt_clown]<br>")
-	if (amt_bluespace)
-		dat += text("Bluespace crystals: [amt_bluespace]<br>")
-
+	var/list/oretypes = list()
+	for(var/obj/item/weapon/ore/O in contents)
+		oretypes |= O.type
+	for(var/i in oretypes)
+		var/obj/item/weapon/ore/T = locate(i) in contents
+		dat += "[capitalize(T.name)]: [count_by_type(contents, T.type)]<br>"
 	dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
-	user << browse("[dat]", "window=orebox")
-	return
+	user << browse(dat, "window=orebox")
 
-/obj/structure/ore_box/proc/dump_contents()
-	for (var/obj/item/weapon/ore/O in contents)
-		contents -= O
-		O.loc = src.loc
+/obj/structure/ore_box/proc/dump_box_contents()
+	for(var/obj/item/weapon/ore/O in contents)
+		O.forceMove(loc)
 
 /obj/structure/ore_box/Topic(href, href_list)
 	if(..())
@@ -110,16 +60,14 @@
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["removeall"])
-		dump_contents()
+		dump_box_contents()
 		usr << "<span class='notice'>You empty the box.</span>"
-	src.updateUsrDialog()
-	return
+	updateUsrDialog()
 
-/obj/structure/ore_box/ex_act(severity, target)
-	if(prob(100 / severity) && severity < 3)
-		qdel(src) //nothing but ores can get inside unless its a bug and ores just return nothing on ex_act, not point in calling it on them
-
-/obj/structure/ore_box/Destroy()
-	dump_contents()
-	return ..()
 
+/obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user)
+	var/obj/item/stack/sheet/mineral/wood/WD = new (loc, 4)
+	if(user)
+		WD.add_fingerprint(user)
+	dump_box_contents()
+	qdel(src)