Merge remote-tracking branch 'upstream/master' into dev

code/game/gamemodes/cult/ritual.dm

@@ -248,7 +248,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				<h3>Drain Blood</h3>
 				This rune instantly heals you of some brute damage at the expense of a person placed on top of the rune. Whenever you invoke a drain rune, ALL drain runes on the station are activated, draining blood from anyone located on top of those runes. This includes yourself, though the blood you drain from yourself just comes back to you. This might help you identify this rune when studying words. One drain gives up to 25HP per each victim, but you can repeat it if you need more. Draining only works on living people, so you might need to recharge your "Battery" once its empty. Drinking too much blood at once might cause blood hunger.<br>
 				<h3>Raise Dead</h3>
-				This rune allows for the resurrection of any dead person. You will need a dead human body and a living human sacrifice. Make 2 raise dead runes. Put a living non-braindead human on top of one, and a dead body on the other one. When you invoke the rune, the life force of the living human will be transferred into the dead body, allowing a ghost standing on top of the dead body to enter it, instantly and fully healing it. Use other runes to ensure there is a ghost ready to be resurrected.<br>
+				This rune allows for the resurrection of any dead person. You will need a dead human body and a living human sacrifice. Make 2 raise dead runes. Put a living, awake human on top of one, and a dead body on the other one. When you invoke the rune, the life force of the living human will be transferred into the dead body, allowing a ghost standing on top of the dead body to enter it, instantly and fully healing it. Use other runes to ensure there is a ghost ready to be resurrected.<br>
 				<h3>Hide runes</h3>
 				This rune makes all nearby runes completely invisible. They are still there and will work if activated somehow, but you cannot invoke them directly if you do not see them.<br>
 				<h3>Reveal runes</h3>

code/game/gamemodes/objective.dm

@@ -1,4 +1,5 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+var/global/list/all_objectives = list()
 
 datum/objective
 	var/datum/mind/owner = null			//Who owns the objective.
@@ -8,9 +9,14 @@ datum/objective
 	var/completed = 0					//currently only used for custom objectives.
 
 	New(var/text)
+		all_objectives |= src
 		if(text)
 			explanation_text = text
 
+	Del()
+		all_objectives -= src
+		..()
+
 	proc/check_completion()
 		return completed
 

code/game/machinery/cryopod.dm

@@ -96,7 +96,6 @@ obj/machinery/computer/cryopod/Topic(href, href_list)
 			frozen_items -= I
 
 	else if(href_list["crew"])
-
 		user << "\red Functionality unavailable at this time."
 
 	src.updateUsrDialog()
@@ -184,11 +183,21 @@ obj/machinery/computer/cryopod/Topic(href, href_list)
 
 		if(!occupant.client && occupant.stat<2) //Occupant is living and has no client.
 
-			//Delete all items not on the preservation list and drop all others into the pod.
+			//Drop all items into the pod.
 			for(var/obj/item/W in occupant)
 				occupant.drop_from_inventory(W)
 				W.loc = src
 
+				if(W.contents.len) //Make sure we catch anything not handled by del() on the items.
+					for(var/obj/item/O in W.contents)
+						O.loc = src
+
+			//Delete all items not on the preservation list.
+			var/list/items = src.contents
+			items -= occupant // Don't delete the occupant
+			items -= announce // or the autosay radio.
+
+			for(var/obj/item/W in items)
 				var/preserve = null
 				for(var/T in preserve_items)
 					if(istype(W,T))
@@ -200,12 +209,27 @@ obj/machinery/computer/cryopod/Topic(href, href_list)
 				else
 					frozen_items += W
 
+			//Update any existing objectives involving this mob.
+			for(var/datum/objective/O in all_objectives)
+				if(O.target && istype(O.target,/datum/mind))
+					if(O.target == occupant.mind)
+						if(O.owner && O.owner.current)
+							O.owner.current << "\red You get the feeling your target is no longer within your reach. Time for Plan [pick(list("A","B","C","D","X","Y","Z"))]..."
+						O.target = null
+						spawn(1) //This should ideally fire after the occupant is deleted.
+							if(!O) return
+							O.find_target()
+							if(!(O.target))
+								all_objectives -= O
+								O.owner.objectives -= O
+								del(O)
+
+			//Handle job slot/tater cleanup.
 			var/job = occupant.mind.assigned_role
-			var/role = occupant.mind.special_role
 
 			job_master.FreeRole(job)
 
-			if(role == "traitor" || role == "MODE")
+			if(occupant.mind.objectives.len)
 				del(occupant.mind.objectives)
 				occupant.mind.special_role = null
 			else

code/modules/mining/mine_turfs.dm

@@ -162,7 +162,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 			if(do_after(user,P.digspeed))
 				user << "\blue You finish [P.drill_verb] the rock."
 
-				if(finds.len)
+				if(finds && finds.len)
 					var/datum/find/F = finds[1]
 					if(round(excavation_level + P.excavation_amount) == F.excavation_required)
 						//Chance to extract any items here perfectly, otherwise just pull them out along with the rock surrounding them
@@ -196,15 +196,15 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 					else
 						GetDrilled(1)
 					return
-				else
-					excavation_level += P.excavation_amount
 
-					//archaeo overlays
-					if(!archaeo_overlay && finds.len)
-						var/datum/find/F = finds[1]
-						if(F.excavation_required <= excavation_level + F.view_range)
-							archaeo_overlay = "overlay_archaeo[rand(1,3)]"
-							overlays += archaeo_overlay
+				excavation_level += P.excavation_amount
+
+				//archaeo overlays
+				if(!archaeo_overlay && finds && finds.len)
+					var/datum/find/F = finds[1]
+					if(F.excavation_required <= excavation_level + F.view_range)
+						archaeo_overlay = "overlay_archaeo[rand(1,3)]"
+						overlays += archaeo_overlay
 
 				//there's got to be a better way to do this
 				var/update_excav_overlay = 0

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

@@ -243,7 +243,7 @@
 	if(!key && brain_op_stage != 4 && stat != DEAD)
 		msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely</span>\n"
 	else if(!client && brain_op_stage != 4 && stat != DEAD)
-		msg += "[t_He] [t_has] a vacant, braindead stare...\n"
+		msg += "[t_He] [t_has] suddenly fallen asleep.\n"
 
 	var/list/wound_flavor_text = list()
 	var/list/is_destroyed = list()