diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm
index ffcbbfd71c..b31830c970 100644
--- a/code/WorkInProgress/mining.dm
+++ b/code/WorkInProgress/mining.dm
@@ -868,6 +868,8 @@ proc/move_mining_shuttle()
 	//if (prob(50))
 	//	seedName = pick(list("1","2","3","4"))
 	//	seedAmt = rand(1,4)
+	if(prob(20))
+		icon_state = "asteroid[rand(0,8)]"
 	spawn(2)
 		updateMineralOverlays()
 
diff --git a/code/defines/procs/syndicate_name.dm b/code/defines/procs/syndicate_name.dm
index f6ab11be1c..e3f56acb64 100644
--- a/code/defines/procs/syndicate_name.dm
+++ b/code/defines/procs/syndicate_name.dm
@@ -90,7 +90,10 @@ var/syndicate_code_response//Code response for traitors.
 					if(1)
 						code_phrase += pick("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequilla sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
 					if(2)
-						code_phrase += "[pick(teleportlocs)]"//Returns a place.
+						if(teleportlocs.len) //tired of those runtime errors -- Urist
+							code_phrase += "[pick(teleportlocs)]"//Returns a place.
+						else
+							code_phrase += pick("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequilla sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
 				safety.Remove(2)
 			if(3)
 				switch(rand(1,3))//Nouns, adjectives, verbs. Can be selected more than once.
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index beedc11f9d..7589ee9a42 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index 1dbcf63205..e17c7535b4 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ