diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm
index 853479a742e..2439ee62ca7 100644
--- a/code/WorkInProgress/mining.dm
+++ b/code/WorkInProgress/mining.dm
@@ -377,7 +377,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 			if(start_loc.y <= target_loc.y)                                 //GOING NORTH-EAST
 				for(y1 = start_loc.y; y1 <= target_loc.y; y1++)
 					for(x1 = start_loc.x; x1 <= target_loc.x; x1++)
-						new/turf/simulated/floor/airless/asteroid(column)
+						new/turf/simulated/floor/plating/airless/asteroid(column)
 						column = get_step(column,EAST)
 					line_start = get_step(line_start,NORTH)
 					column = line_start
@@ -386,7 +386,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 			else                                                            //GOING NORTH-WEST
 				for(y1 = start_loc.y; y1 >= target_loc.y; y1--)
 					for(x1 = start_loc.x; x1 <= target_loc.x; x1++)
-						new/turf/simulated/floor/airless/asteroid(column)
+						new/turf/simulated/floor/plating/airless/asteroid(column)
 						column = get_step(column,WEST)
 					line_start = get_step(line_start,NORTH)
 					column = line_start
@@ -396,7 +396,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 			if(start_loc.y <= target_loc.y)                                 //GOING SOUTH-EAST
 				for(y1 = start_loc.y; y1 <= target_loc.y; y1++)
 					for(x1 = start_loc.x; x1 >= target_loc.x; x1--)
-						new/turf/simulated/floor/airless/asteroid(column)
+						new/turf/simulated/floor/plating/airless/asteroid(column)
 						column = get_step(column,EAST)
 					line_start = get_step(line_start,SOUTH)
 					column = line_start
@@ -405,7 +405,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 			else                                                            //GOING SOUTH-WEST
 				for(y1 = start_loc.y; y1 >= target_loc.y; y1--)
 					for(x1 = start_loc.x; x1 >= target_loc.x; x1--)
-						new/turf/simulated/floor/airless/asteroid(column)
+						new/turf/simulated/floor/plating/airless/asteroid(column)
 						column = get_step(column,WEST)
 					line_start = get_step(line_start,SOUTH)
 					column = line_start
@@ -747,7 +747,7 @@ proc/move_mining_shuttle()
 
 /turf/simulated/mineral/ReplaceWithFloor()
 	if(!icon_old) icon_old = icon_state
-	var/turf/simulated/floor/airless/asteroid/W
+	var/turf/simulated/floor/plating/airless/asteroid/W
 	var/old_dir = dir
 
 	for(var/direction in cardinal)
@@ -758,7 +758,7 @@ proc/move_mining_shuttle()
 				shroom.pixel_x = 0
 				shroom.pixel_y = 0
 
-	W = new /turf/simulated/floor/airless/asteroid( locate(src.x, src.y, src.z) )
+	W = new /turf/simulated/floor/plating/airless/asteroid( locate(src.x, src.y, src.z) )
 	W.dir = old_dir
 	W.fullUpdateMineralOverlays()
 
@@ -840,18 +840,19 @@ proc/move_mining_shuttle()
 
 /**********************Asteroid**************************/
 
-/turf/simulated/floor/airless/asteroid //floor piece
+/turf/simulated/floor/plating/airless/asteroid //floor piece
 	name = "Asteroid"
 	icon = 'floors.dmi'
 	icon_state = "asteroid"
 	oxygen = 0
 	nitrogen = 0
 	temperature = TCMB
+	icon_plating = "asteroid"
 	var/seedName = "" //Name of the seed it contains
 	var/seedAmt = 0   //Ammount of the seed it contains
 	var/dug = 0       //0 = has not yet been dug, 1 = has already been dug
 
-/turf/simulated/floor/airless/asteroid/New()
+/turf/simulated/floor/plating/airless/asteroid/New()
 	..()
 	//if (prob(50))
 	//	seedName = pick(list("1","2","3","4"))
@@ -859,13 +860,13 @@ proc/move_mining_shuttle()
 	spawn(2)
 		updateMineralOverlays()
 
-/turf/simulated/floor/airless/asteroid/ex_act(severity)
+/turf/simulated/floor/plating/airless/asteroid/ex_act(severity)
 	return
 
-/turf/simulated/floor/airless/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		usr << "\red You don't have the dexterity to do this!"
-		return
+/turf/simulated/floor/plating/airless/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
+
+	if(!W || !user)
+		return 0
 
 	if (istype(W, /obj/item/weapon/shovel))
 		var/turf/T = user.loc
@@ -884,13 +885,13 @@ proc/move_mining_shuttle()
 			user << "\blue You dug a hole."
 			gets_dug()
 			dug = 1
+			icon_plating = "asteroid_dug"
 			icon_state = "asteroid_dug"
-
 	else
-		return attack_hand(user)
+		..(W,user)
 	return
 
-/turf/simulated/floor/airless/asteroid/proc/gets_dug()
+/turf/simulated/floor/plating/airless/asteroid/proc/gets_dug()
 	if ((src.seedName != "") && (src.seedAmt > 0) && (src.seedAmt < 11))
 		var/i
 		for (i=0;i<seedAmt;i++)
@@ -910,7 +911,7 @@ proc/move_mining_shuttle()
 	new/obj/item/weapon/ore/glass(src)
 	return
 
-/turf/simulated/floor/airless/asteroid/proc/updateMineralOverlays()
+/turf/simulated/floor/plating/airless/asteroid/proc/updateMineralOverlays()
 
 	src.overlays = null
 
@@ -924,30 +925,30 @@ proc/move_mining_shuttle()
 		src.overlays += image('walls.dmi', "rock_side_w", layer=6)
 
 
-/turf/simulated/floor/airless/asteroid/proc/fullUpdateMineralOverlays()
-	var/turf/simulated/floor/airless/asteroid/A
-	if(istype(get_step(src, WEST), /turf/simulated/floor/airless/asteroid))
+/turf/simulated/floor/plating/airless/asteroid/proc/fullUpdateMineralOverlays()
+	var/turf/simulated/floor/plating/airless/asteroid/A
+	if(istype(get_step(src, WEST), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, WEST)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, EAST), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, EAST), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, EAST)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, NORTH), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, NORTH), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, NORTH)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, NORTHWEST), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, NORTHWEST), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, NORTHWEST)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, NORTHEAST), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, NORTHEAST), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, NORTHEAST)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, SOUTHWEST), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, SOUTHWEST), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, SOUTHWEST)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, SOUTHEAST), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, SOUTHEAST), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, SOUTHEAST)
 		A.updateMineralOverlays()
-	if(istype(get_step(src, SOUTH), /turf/simulated/floor/airless/asteroid))
+	if(istype(get_step(src, SOUTH), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, SOUTH)
 		A.updateMineralOverlays()
 	src.updateMineralOverlays()
diff --git a/code/defines/turf.dm b/code/defines/turf.dm
index a60e9484e71..18eee636bb7 100644
--- a/code/defines/turf.dm
+++ b/code/defines/turf.dm
@@ -24,6 +24,8 @@
 
 	proc/is_plating()
 		return 0
+	proc/is_asteroid_floor()
+		return 0
 	proc/is_steel_floor()
 		return 0
 	proc/is_light_floor()
diff --git a/code/game/turf.dm b/code/game/turf.dm
index daf12ae2cd2..43d2cd211a2 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -518,7 +518,10 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 				"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2",
 				"platingdmg3","plating","light_on","light_on_flicker1","light_on_flicker2",
 				"light_on_clicker3","light_on_clicker4","light_on_clicker5","light_broken",
-				"light_on_broken","light_off","wall_thermite","grass1","grass2","grass3","grass4")
+				"light_on_broken","light_off","wall_thermite","grass1","grass2","grass3","grass4",
+				"asteroid","asteroid_dug","burning","oldburning","light-on-r","light-on-y","light-on-g","light-on-b")
+
+var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3","asteroid","asteroid_dug")
 
 /turf/simulated/floor
 
@@ -528,6 +531,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 	icon = 'floors.dmi'
 	icon_state = "floor"
 	var/icon_regular_floor = "floor" //used to remember what icon the tile should have by default
+	var/icon_plating = "plating"
 	thermal_conductivity = 0.040
 	heat_capacity = 10000
 	var/broken = 0
@@ -623,7 +627,7 @@ turf/simulated/floor/proc/update_icon()
 			icon_state = icon_regular_floor
 	if(is_plating())
 		if(!broken && !burnt)
-			icon_state = "plating"
+			icon_state = icon_plating //Because asteroids are 'platings' too.
 	if(is_light_floor())
 		var/obj/item/stack/tile/light/T = floor_tile
 		if(T.on)
@@ -733,8 +737,7 @@ turf/simulated/floor/return_siding_icon_state()
 /turf/simulated/floor/is_plating()
 	if(!floor_tile)
 		return 1
-	else
-		return 0
+	return 0
 
 /turf/simulated/floor/proc/break_tile()
 	if(istype(src,/turf/simulated/floor/engine)) return
@@ -783,6 +786,7 @@ turf/simulated/floor/return_siding_icon_state()
 
 	if(!floor_tile) return
 	del(floor_tile)
+	icon_plating = "plating"
 	sd_SetLuminosity(0)
 	floor_tile = null
 	intact = 0
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 521bd98ff90..beedc11f9d0 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm
index 47ae19e460c..fd6df7d0cd4 100644
--- a/maps/tgstation.2.0.7.dmm
+++ b/maps/tgstation.2.0.7.dmm
@@ -7613,7 +7613,7 @@
 "cQu" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/living_quarters)
 "cQv" = (/obj/grille,/obj/disposalpipe/segment,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/mine/living_quarters)
 "cQw" = (/obj/machinery/mineral/stacking_unit_console,/turf/simulated/wall,/area/mine/production)
-"cQx" = (/turf/simulated/floor/airless/asteroid,/area)
+"cQx" = (/turf/simulated/floor/plating/airless/asteroid,/area)
 "cQy" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/living_quarters)
 "cQz" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "wood"},/area/mine/living_quarters)
 "cQA" = (/obj/machinery/vending/cola,/turf/simulated/floor{icon_state = "wood"},/area/mine/living_quarters)
@@ -7637,7 +7637,7 @@
 "cQS" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/mine/lobby)
 "cQT" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/mine/lobby)
 "cQU" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "Production"; req_access_txt = "54"},/turf/simulated/floor,/area/mine/production)
-"cQV" = (/obj/light_emitter,/turf/simulated/floor/airless/asteroid,/area)
+"cQV" = (/obj/light_emitter,/turf/simulated/floor/plating/airless/asteroid,/area)
 "cQW" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "wood"},/area/mine/living_quarters)
 "cQX" = (/obj/machinery/power/apc{dir = 2; name = "Mining Crew Quarters APC"; pixel_y = -24},/obj/disposalpipe/segment,/obj/cable,/turf/simulated/floor{icon_state = "wood"},/area/mine/living_quarters)
 "cQY" = (/obj/closet/emcloset,/turf/simulated/floor,/area/mine/lobby)
@@ -7718,23 +7718,23 @@
 "cSv" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/mine/maintenance)
 "cSw" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/mine/maintenance)
 "cSx" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/maintenance)
-"cSy" = (/obj/crate/miningcar,/turf/simulated/floor/airless/asteroid,/area)
+"cSy" = (/obj/crate/miningcar,/turf/simulated/floor/plating/airless/asteroid,/area)
 "cSz" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/mine/maintenance)
 "cSA" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/maintenance)
-"cSB" = (/turf/simulated/floor/airless/asteroid,/area/mine/explored)
+"cSB" = (/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
 "cSC" = (/turf/simulated/mineral,/area/mine/explored)
-"cSD" = (/obj/machinery/camera{c_tag = "Mine Entrance"; dir = 4; network = "Mine"},/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSE" = (/obj/closet/emcloset{icon_closed = "mining"; icon_opened = "miningopen"; icon_state = "mining"},/turf/simulated/floor/airless/asteroid,/area/mine/explored)
+"cSD" = (/obj/machinery/camera{c_tag = "Mine Entrance"; dir = 4; network = "Mine"},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSE" = (/obj/closet/emcloset{icon_closed = "mining"; icon_opened = "miningopen"; icon_state = "mining"},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
 "cSF" = (/turf/simulated/mineral/random,/area/mine/explored)
-"cSG" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSH" = (/obj/crate/miningcar,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSI" = (/obj/ore_box,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSJ" = (/obj/reagent_dispensers/fueltank,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSK" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSL" = (/obj/item/weapon/pickaxe,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSM" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSN" = (/obj/item/weapon/shovel,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
-"cSO" = (/obj/item/weapon/satchel,/turf/simulated/floor/airless/asteroid,/area/mine/explored)
+"cSG" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSH" = (/obj/crate/miningcar,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSI" = (/obj/ore_box,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSJ" = (/obj/reagent_dispensers/fueltank,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSK" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSL" = (/obj/item/weapon/pickaxe,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSM" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSN" = (/obj/item/weapon/shovel,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
+"cSO" = (/obj/item/weapon/satchel,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
 "cSP" = (/turf/simulated/mineral/iron,/area/mine/unexplored)
 "cSQ" = (/turf/space,/area/mine/unexplored)
 "cSR" = (/turf/unsimulated/wall{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach)