Merge pull request #961 from Giacomand/blob_fix2

Blob Tweaks

code/modules/events/blob.dm

@@ -4,6 +4,8 @@
 	weight = 5
 	max_occurrences = 1
 
+	earliest_start = 48000 // 1 hour 20 minutes
+
 /datum/round_event/blob
 	announceWhen	= 12
 	endWhen			= 120

code/modules/mining/mine_items.dm

@@ -133,7 +133,7 @@ proc/move_mining_shuttle()
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["move"])
-		if(ticker.mode.name == "blob")
+		if(mining_shuttle_location == 1 && istype(ticker.mode, /datum/game_mode/blob)) // shuttle is on the station, this will mean miners can come back
 			if(ticker.mode:declared)
 				usr << "Under directive 7-10, [station_name()] is quarantined until further notice."
 				return

code/modules/mob/living/silicon/robot/robot.dm

@@ -238,6 +238,9 @@
 		adjustBruteLoss(60)
 		updatehealth()
 		return 1
+	else
+		gib()
+		return 1
 	return 0
 
 /mob/living/silicon/robot/Stat()

code/modules/recycling/disposal.dm

@@ -39,6 +39,10 @@
 			//gas.volume = 1.05 * CELLSTANDARD
 			update()
 
+	Del()
+		for(var/atom/movable/AM in contents)
+			AM.loc = src.loc
+		..()
 
 	// attack by item places it in to disposal
 	attackby(var/obj/item/I, var/mob/user)