Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/mob/living/carbon/human/life.dm

@@ -24,6 +24,9 @@
 	if(!loc)			// Fixing a null error that occurs when the mob isn't found in the world -- TLE
 		return
 
+	if(stat == 2)
+		return
+
 	life_tick++
 
 	var/datum/gas_mixture/environment = loc.return_air()

code/modules/power/singularity/singularity.dm

@@ -216,8 +216,9 @@ var/global/list/uneatable = list(
 						step_towards(X,src)
 				else if(istype(X,/mob/living/carbon/human))
 					var/mob/living/carbon/human/H = X
-					H << "\red The singularity has you in it's gravitational pull!  It's hard to break free!"
-					H.grav_delay = 20 //No running this time!
+					if(prob(25))
+						H << "\red The singularity has you in it's gravitational pull!  It's hard to break free!"
+						H.grav_delay = 15 //No running this time!
 					if(istype(H.shoes,/obj/item/clothing/shoes/magboots) && !(src.current_size >= 9))
 						var/obj/item/clothing/shoes/magboots/M = H.shoes
 						if(M.magpulse)