Merge branch 'master' into familyport

code/modules/mob/dead/dead.dm

@@ -126,5 +126,5 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	return ..()
 
 /mob/dead/onTransitZ(old_z,new_z)
-	..()
+	. = ..()
 	update_z(new_z)

code/modules/mob/dead/new_player/new_player.dm

@@ -578,8 +578,6 @@
 			Spl.Fade(TRUE)
 			character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
 
-		character.update_parallax_teleport()
-
 	job.standard_assign_skills(character.mind)
 
 	SSticker.minds += character.mind

code/modules/mob/dead/observer/observer.dm

@@ -377,8 +377,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			return
 		ghostize(0, penalize = TRUE)
 
-
-
 /mob/dead/observer/Move(NewLoc, direct)
 	if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, NewLoc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
 		return
@@ -388,7 +386,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	if(NewLoc)
 		forceMove(NewLoc)
-		update_parallax_contents()
 	else
 		forceMove(get_turf(src))  //Get out of closets and such as a ghost
 		if((direct & NORTH) && y < world.maxy)
@@ -487,9 +484,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!L || !L.len)
 		to_chat(usr, "No area available.")
 		return
-
 	usr.forceMove(pick(L))
-	update_parallax_contents()
 
 /mob/dead/observer/proc/view_gas()
 	set category = "Ghost"
@@ -568,7 +563,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 			if(T && isturf(T))	//Make sure the turf exists, then move the source to that destination.
 				A.forceMove(T)
-				A.update_parallax_contents()
 			else
 				to_chat(A, "This mob is not located in the game world.")
 

code/modules/mob/dead/observer/respawn.dm

@@ -165,7 +165,7 @@
 
 /**
  * Actual proc that removes us and puts us back on lobby
- * 
+ *
  * Returns the new mob.
  */
 /mob/dead/observer/proc/transfer_to_lobby()
@@ -174,8 +174,7 @@
 		return
 	client.screen.Cut()
 	client.view_size.resetToDefault()
-	client.generate_clickcatcher()
-	client.apply_clickcatcher()
+	client.update_clickcatcher()
 	client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))
 	client.view_size.resetToDefault()