Merge pull request #844 from Erthilo/TGUpdates

TG Updates up to r2962

code/modules/mob/living/carbon/alien/humanoid/death.dm

@@ -31,30 +31,4 @@
 	if (mind) mind.store_memory("Time of death: [tod]", 0)
 	else src << "We seem to have misplaced your mind datum, so we can't add this to your memory, but you died at [tod]"
 
-	var/cancel
-	for (var/mob/M in world)
-		if (M.client && !M.stat)
-			cancel = 1
-			break
-
-	if (!cancel && !abandon_allowed)
-		spawn (50)
-			cancel = 0
-			for (var/mob/M in world)
-				if (M.client && !M.stat)
-					cancel = 1
-					break
-
-			if (!cancel && !abandon_allowed)
-				world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-				feedback_set_details("end_error","no live players")
-				feedback_set_details("round_end","[time2text(world.realtime)]")
-				if(blackbox)
-					blackbox.save_all_data_to_sql()
-
-				spawn (300)
-					log_game("Rebooting because of no live players")
-					world.Reboot()
-
 	return ..(gibbed)

code/modules/mob/living/carbon/alien/larva/death.dm

@@ -34,30 +34,4 @@
 		var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
 		mind.store_memory("Time of death: [tod]", 0)
 
-	var/cancel
-	for (var/mob/M in world)
-		if (M.client && !M.stat)
-			cancel = 1
-			break
-
-	if (!cancel && !abandon_allowed)
-		spawn (50)
-			cancel = 0
-			for (var/mob/M in world)
-				if (M.client && !M.stat)
-					cancel = 1
-					break
-
-			if (!cancel && !abandon_allowed)
-				world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-				feedback_set_details("end_error","no live players")
-				feedback_set_details("round_end","[time2text(world.realtime)]")
-				if(blackbox)
-					blackbox.save_all_data_to_sql()
-
-				spawn (300)
-					log_game("Rebooting because of no live players")
-					world.Reboot()
-
 	return ..(gibbed)

code/modules/mob/living/carbon/brain/death.dm

@@ -15,25 +15,8 @@
 	see_invisible = 2
 
 	var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
-	var/cancel
 	store_memory("Time of death: [tod]", 0)
 
-	for(var/mob/M in world)
-		if ((M.client && !( M.stat )))
-			cancel = 1
-			break
-	if (!( cancel ))
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-		feedback_set_details("end_error","no live players")
-		feedback_set_details("round_end","[time2text(world.realtime)]")
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		spawn( 300 )
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
 	if (key)
 		spawn(50)
 			if(key && stat == 2)

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

@@ -56,32 +56,6 @@
 		message_admins("\red Traitor [key_name_admin(src)] has died.")
 		log_game("Traitor [key_name(src)] has died.")
 
-	var/cancel
-	for (var/mob/M in world)
-		if (M.client && !M.stat)
-			cancel = 1
-			break
-
-	if (!cancel && !abandon_allowed)
-		spawn (50)
-			cancel = 0
-			for (var/mob/M in world)
-				if (M.client && !M.stat)
-					cancel = 1
-					break
-
-			if (!cancel && !abandon_allowed)
-				world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-				feedback_set_details("end_error","no live players")
-				feedback_set_details("round_end","[time2text(world.realtime)]")
-				if(blackbox)
-					blackbox.save_all_data_to_sql()
-
-				spawn (300)
-					log_game("Rebooting because of no live players")
-					world.Reboot()
-
 	return ..(gibbed)
 
 /mob/living/carbon/human/proc/ChangeToHusk()

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

@@ -1282,7 +1282,7 @@
 					if (druggy)
 						client.screen += hud_used.druggy
 
-					if (istype(head, /obj/item/clothing/head/helmet/welding))
+					if ((istype(head, /obj/item/clothing/head/helmet/welding)) )
 						if(!head:up && tinted_weldhelh)
 							client.screen += hud_used.darkMask
 

code/modules/mob/living/carbon/metroid/death.dm

@@ -1,7 +1,7 @@
 /mob/living/carbon/metroid/death(gibbed)
 	if(src.stat == 2)
 		return
-	var/cancel
+
 	if(!gibbed)
 		if(istype(src, /mob/living/carbon/metroid/adult))
 
@@ -32,27 +32,8 @@
 	drop_item()
 	src.hand = h
 
-	//var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
-	//mind.store_memory("Time of death: [tod]", 0)
-
 	ticker.mode.check_win()
-	//src.icon_state = "dead"
-	for(var/mob/M in world)
-		if ((M.client && !( M.stat )))
-			cancel = 1
-			break
-	if (!( cancel ))
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
 
-		feedback_set_details("end_error","no live players")
-		feedback_set_details("round_end","[time2text(world.realtime)]")
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		spawn( 300 )
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
 	if (src.key)
 		spawn(50)
 			if(src.key && src.stat == 2)

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

@@ -359,7 +359,10 @@
 					Tempstun = 1
 
 				if(bodytemperature <= (T0C - 50)) // hurt temperature
-					adjustFireLoss(round(sqrt(bodytemperature)) * 2)
+					if(bodytemperature <= 50) // sqrting negative numbers is bad
+						adjustFireLoss(200)
+					else
+						adjustFireLoss(round(sqrt(bodytemperature)) * 2)
 
 			else
 				Tempstun = 0

code/modules/mob/living/carbon/monkey/death.dm

@@ -1,7 +1,7 @@
 /mob/living/carbon/monkey/death(gibbed)
 	if(src.stat == 2)
 		return
-	var/cancel
+
 	if (src.healths)
 		src.healths.icon_state = "health5"
 	if(!gibbed)
@@ -21,27 +21,8 @@
 	drop_item()
 	src.hand = h
 
-	//var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
-	//mind.store_memory("Time of death: [tod]", 0)
-
 	ticker.mode.check_win()
-	//src.icon_state = "dead"
-	for(var/mob/M in world)
-		if ((M.client && !( M.stat )))
-			cancel = 1
-			break
-	if (!( cancel ))
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
 
-		feedback_set_details("end_error","no live players")
-		feedback_set_details("round_end","[time2text(world.realtime)]")
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		spawn( 300 )
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
 	if (src.key)
 		spawn(50)
 			if(src.key && src.stat == 2)

code/modules/mob/living/silicon/ai/death.dm

@@ -1,5 +1,4 @@
 /mob/living/silicon/ai/death(gibbed)
-	var/cancel
 	stat = 2
 	canmove = 0
 	if(blind)
@@ -49,24 +48,8 @@
 			loc.icon_state = "aicard-404"
 
 	var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
-	mind.store_memory("Time of death: [tod]", 0)
+	if(mind)	mind.store_memory("Time of death: [tod]", 0)
 
-	for(var/mob/M in world)
-		if ((M.client && !( M.stat )))
-			cancel = 1
-			break
-	if (!( cancel ))
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-		feedback_set_details("end_error","no live players")
-		feedback_set_details("round_end","[time2text(world.realtime)]")
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		spawn( 300 )
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
 	if (key)
 		spawn(50)
 			if(key && stat == 2)

code/modules/mob/living/silicon/pai/death.dm

@@ -1,5 +1,4 @@
 /mob/living/silicon/pai/death(gibbed)
-	var/cancel
 	src.stat = 2
 	src.canmove = 0
 	if(src.blind)
@@ -13,22 +12,6 @@
 	//var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
 	//mind.store_memory("Time of death: [tod]", 0)
 
-	for(var/mob/M in world)
-		if ((M.client && !( M.stat )))
-			cancel = 1
-			break
-	if (!( cancel ))
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-		feedback_set_details("end_error","no live players")
-		feedback_set_details("round_end","[time2text(world.realtime)]")
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		spawn( 300 )
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
 	if(key)
 		spawn(50)
 			src.ghostize(1)

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

@@ -1,5 +1,4 @@
 /mob/living/silicon/robot/death(gibbed)
-	var/cancel
 	if (!gibbed)
 		src.emote("deathgasp")
 	src.stat = 2
@@ -28,22 +27,6 @@
 
 	sql_report_cyborg_death(src)
 
-	for(var/mob/M in world)
-		if ((M.client && !( M.stat )))
-			cancel = 1
-			break
-	if (!( cancel ))
-		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
-
-		feedback_set_details("end_error","no live players")
-		feedback_set_details("round_end","[time2text(world.realtime)]")
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		spawn( 300 )
-			log_game("Rebooting because of no live players")
-			world.Reboot()
-			return
 	if (src.key)
 		spawn(50)
 			if(src.key && src.stat == 2)

code/modules/mob/mob.dm

@@ -105,6 +105,34 @@
 
 /mob/proc/death(gibbed)
 	timeofdeath = world.time
+
+	var/cancel = 0
+	for(var/mob/M in world)
+		if(M.client && (M.stat != DEAD))
+			cancel = 1
+			break
+	if(!cancel)
+		world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
+
+
+
+		spawn(300)
+			for(var/mob/M in world)
+				if(M.client && (M.stat != DEAD))
+					world << "Aborting world restart!"
+					return
+
+			feedback_set_details("end_error","no live players")
+
+			if(blackbox)
+				blackbox.save_all_data_to_sql()
+
+			sleep(50)
+
+			log_game("Rebooting because of no live players")
+			world.Reboot()
+			return
+
 	return ..(gibbed)
 
 /mob/proc/restrained()

code/modules/mob/mob_helpers.dm

@@ -252,6 +252,7 @@ proc/slur(phrase)
 		p++//for each letter p is increased to find where the next letter will be.
 	return copytext(sanitize(t),1,MAX_MESSAGE_LEN)
 
+
 proc/Gibberish(t, p)
 	/* Turn text into complete gibberish! */
 	var/returntext = ""
@@ -269,6 +270,7 @@ proc/Gibberish(t, p)
 
 	return returntext
 
+
 /proc/ninjaspeak(n)
 /*
 The difference with stutter is that this proc can stutter more than 1 letter

code/modules/mob/mob_movement.dm

@@ -172,8 +172,10 @@
 	//if(istype(mob.loc, /turf/space) || (mob.flags & NOGRAV))
 	//	if(!mob.Process_Spacemove(0))	return 0
 
-	var/area/a = get_area(mob.loc)
-	if((istype(mob.loc, /turf/space)) || (a.has_gravity == 0))
+	if(!mob.lastarea)
+		mob.lastarea = get_area(mob.loc)
+
+	if((istype(mob.loc, /turf/space)) || (mob.lastarea.has_gravity == 0))
 		if(!mob.Process_Spacemove(0))	return 0
 
 
@@ -215,16 +217,17 @@
 				if(L.len == 2)
 					L -= mob
 					var/mob/M = L[1]
-					if ((get_dist(mob, M) <= 1 || M.loc == mob.loc))
-						var/turf/T = mob.loc
-						. = ..()
-						if (isturf(M.loc))
-							var/diag = get_dir(mob, M)
-							if ((diag - 1) & diag)
-							else
-								diag = null
-							if ((get_dist(mob, M) > 1 || diag))
-								step(M, get_dir(M.loc, T))
+					if(M)
+						if ((get_dist(mob, M) <= 1 || M.loc == mob.loc))
+							var/turf/T = mob.loc
+							. = ..()
+							if (isturf(M.loc))
+								var/diag = get_dir(mob, M)
+								if ((diag - 1) & diag)
+								else
+									diag = null
+								if ((get_dist(mob, M) > 1 || diag))
+									step(M, get_dir(M.loc, T))
 				else
 					for(var/mob/M in L)
 						M.other_mobs = 1
@@ -351,16 +354,13 @@
 		if(istype(turf,/turf/space))
 			continue
 
-
-		var/area/a = get_area(turf)
-
 		if(istype(src,/mob/living/carbon/human/))  // Only humans can wear magboots, so we give them a chance to.
-			if((istype(turf,/turf/simulated/floor)) && (a.has_gravity == 0) && !(istype(src:shoes, /obj/item/clothing/shoes/magboots) && (src:shoes:flags & NOSLIP)))
+			if((istype(turf,/turf/simulated/floor)) && (src.lastarea.has_gravity == 0) && !(istype(src:shoes, /obj/item/clothing/shoes/magboots) && (src:shoes:flags & NOSLIP)))
 				continue
 
 
 		else
-			if((istype(turf,/turf/simulated/floor)) && (a.has_gravity == 0)) // No one else gets a chance.
+			if((istype(turf,/turf/simulated/floor)) && (src.lastarea.has_gravity == 0)) // No one else gets a chance.
 				continue
 
 		/*

code/modules/mob/new_player/new_player.dm

@@ -24,6 +24,8 @@
 		var/starting_loc = pick(newplayer_start)
 		if(!starting_loc)	starting_loc = locate(1,1,1)
 		loc = starting_loc
+		lastarea = starting_loc
+
 		sight |= SEE_TURFS
 
 		var/list/watch_locations = list()