Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

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

@@ -580,8 +580,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
@@ -764,6 +762,7 @@
 
 		client.prefs.scars_list["[cur_scar_index]"] = valid_scars
 		client.prefs.save_character()
+	
 	client.prefs.copy_to(H, initial_spawn = TRUE)
 	H.dna.update_dna_identity()
 	if(mind)

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

@@ -28,10 +28,9 @@
 	for(var/path in typesof(prototype))
 		if(path == prototype && skip_prototype)
 			continue
-		if(roundstart)
-			var/datum/sprite_accessory/P = path
-			if(initial(P.locked))
-				continue
+		var/datum/sprite_accessory/P = path
+		if((roundstart && initial(P.locked)))
+			continue
 		var/datum/sprite_accessory/D = new path()
 
 		if(D.icon_state)
@@ -64,6 +63,7 @@
 	var/mutant_part_string //Also used in species.handle_mutant_bodyparts() to generate the overlay icon state.
 	var/alpha_mask_state
 	var/matrixed_sections = MATRIX_NONE //if color_src is MATRIXED, how many sections does it have? 1-3
+	var/ignore = FALSE //NEVER include in customization if set to TRUE
 
 	//Special / holdover traits for Citadel specific sprites.
 	var/extra = FALSE

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

@@ -126,6 +126,11 @@
 	hide_legs = USE_SNEK_CLIP_MASK
 	matrixed_sections = MATRIX_RED_GREEN
 
+/datum/sprite_accessory/taur/naga/coiled
+	name = "Naga (coiled)"
+	icon_state = "naga_coiled"
+	ignore = TRUE
+
 /datum/sprite_accessory/taur/otie
 	name = "Otie"
 	icon_state = "otie"

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

@@ -1,4 +1,8 @@
-//Angel Wings
+//Functional Wings
+
+/datum/sprite_accessory/wings
+	icon = 'icons/mob/wings_functional.dmi'
+	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
 /datum/sprite_accessory/wings/none
 	name = "None"
@@ -9,23 +13,12 @@
 	return (!H.dna.features["wings"] || H.dna.features["wings"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception))))
 
 /datum/sprite_accessory/wings_open
-	icon = 'icons/mob/wings.dmi'
+	icon = 'icons/mob/wings_functional.dmi'
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
 /datum/sprite_accessory/wings_open/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
 	return (H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception)) || H.dna.species.mutant_bodyparts["wings"])
 
-/datum/sprite_accessory/wings_open/angel
-	name = "Angel"
-	icon_state = "angel"
-	color_src = 0
-	dimension_x = 46
-	center = TRUE
-	dimension_y = 34
-
-/datum/sprite_accessory/wings
-	icon = 'icons/mob/wings.dmi'
-	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 
 /datum/sprite_accessory/wings/angel
 	name = "Angel"
@@ -36,6 +29,114 @@
 	dimension_y = 34
 	locked = TRUE
 
+/datum/sprite_accessory/wings_open/angel
+	name = "Angel"
+	icon_state = "angel"
+	color_src = 0
+	dimension_x = 46
+	center = TRUE
+	dimension_y = 34
+
+/datum/sprite_accessory/wings/dragon
+	name = "Dragon"
+	icon_state = "dragon"
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+	locked = TRUE
+
+/datum/sprite_accessory/wings_open/dragon
+	name = "Dragon"
+	icon_state = "dragon"
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+
+/datum/sprite_accessory/wings/megamoth
+	name = "Megamoth"
+	icon_state = "megamoth"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+	locked = TRUE
+
+/datum/sprite_accessory/wings_open/megamoth
+	name = "Megamoth"
+	icon_state = "megamoth"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+
+/datum/sprite_accessory/wings/mothra
+	name = "Mothra"
+	icon_state = "mothra"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+	locked = TRUE
+
+/datum/sprite_accessory/wings_open/mothra
+	name = "Mothra"
+	icon_state = "mothra"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+
+/datum/sprite_accessory/wings/skeleton
+	name = "Skeleton"
+	icon_state = "skele"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+	locked = TRUE
+
+/datum/sprite_accessory/wings_open/skeleton
+	name = "Skeleton"
+	icon_state = "skele"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+
+/datum/sprite_accessory/wings/robotic
+	name = "Robotic"
+	icon_state = "robotic"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+	locked = TRUE
+
+/datum/sprite_accessory/wings_open/robotic
+	name = "Robotic"
+	icon_state = "robotic"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+
+/datum/sprite_accessory/wings/fly
+	name = "Fly"
+	icon_state = "fly"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+	locked = TRUE
+
+/datum/sprite_accessory/wings_open/fly
+	name = "Fly"
+	icon_state = "fly"
+	color_src = FALSE
+	dimension_x = 96
+	center = TRUE
+	dimension_y = 32
+
 // Decorative wings
 
 /datum/sprite_accessory/deco_wings
@@ -43,6 +144,10 @@
 	color_src = WINGCOLOR
 	mutant_part_string = "insect_wings"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
+	var/list/upgrade_to = list() //What the wings change to if the mob consumes a flight potion or gains true wings through other means. If it's an empty list, it will pick the species alternative instead.
+
+/datum/sprite_accessory/deco_wings/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
+	return (H.dna.features["wings"] != "None") //true wings will override decorative wings
 
 /datum/sprite_accessory/deco_wings/none
 	name = "None"
@@ -57,162 +162,201 @@
 	center = TRUE
 	dimension_y = 34
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
+	upgrade_to = SPECIES_WINGS_ANGEL //obviously
 
 //nonmoth wings
 
 /datum/sprite_accessory/deco_wings/bat
 	name = "Bat"
 	icon_state = "bat"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/deco_wings/bee
 	name = "Bee"
 	icon_state = "bee"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/deco_wings/bee2
 	name = "Small Bee"
 	icon_state = "beewings"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/deco_wings/dragon
 	name = "Dragon"
 	icon_state = "dragon"
+	upgrade_to = SPECIES_WINGS_DRAGON //lol
 
 /datum/sprite_accessory/deco_wings/dragonfly
 	name = "Dragonfly"
 	icon_state = "dragonfly"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/deco_wings/fairy
 	name = "Fairy"
 	icon_state = "fairy"
+	upgrade_to = SPECIES_WINGS_INSECT //rip people's sparkly wings until someone sprites in some huge fairy wings or something
 
 /datum/sprite_accessory/deco_wings/featheredwing
 	name = "Feathery"
 	icon_state = "feathery"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/deco_wings/featheredwingmedium
 	name = "Medium Feathered"
 	icon_state = "feathered3"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/deco_wings/featheredwinglarge
 	name = "Large Feathered"
 	icon_state = "feathered2"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/deco_wings/harpywings
 	name = "Harpy"
 	icon_state = "harpywings"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/deco_wings/roboticwing
 	name = "Robotic"
 	icon_state = "drago"
+	upgrade_to = SPECIES_WINGS_ROBOT
 
 /datum/sprite_accessory/deco_wings/succubusblack
 	name = "Succubus Black"
 	icon_state = "succubusblack"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/deco_wings/succubuspurple
 	name = "Succubus Purple"
 	icon_state = "succubuspurple"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/deco_wings/succubusred
 	name = "Succubus Red"
 	icon_state = "succubusred"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/deco_wings/xenobackplate
 	name = "Xenomorph Backplate"
 	icon_state = "snagbackplate"
+	upgrade_to = list()
 
 //moth wings
 
 /datum/sprite_accessory/deco_wings/atlas
 	name = "Atlas"
 	icon_state = "atlas"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/brown
 	name = "Brown"
 	icon_state = "brown"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/deathhead
 	name = "Deathshead"
 	icon_state = "deathhead"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/featherymoth
 	name = "Feathery Moth Wings"
 	icon_state = "featherymoth"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/firewatch
 	name = "Firewatch"
 	icon_state = "firewatch"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/gothic
 	name = "Gothic"
 	icon_state = "gothic"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/jungle
 	name = "Jungle"
 	icon_state = "jungle"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/lovers
 	name = "Lovers"
 	icon_state = "lovers"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/luna
 	name = "Luna"
 	icon_state = "luna"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/monarch
 	name = "Monarch"
 	icon_state = "monarch"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/moonfly
 	name = "Moon Fly"
 	icon_state = "moonfly"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/oakworm
 	name = "Oak Worm"
 	icon_state = "oakworm"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/plain
 	name = "Plain"
 	icon_state = "plain"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/plasmafire
 	name = "Plasma Fire"
 	icon_state = "plasmafire"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/poison
 	name = "Poison"
 	icon_state = "poison"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/punished
 	name = "Burnt Off"
 	icon_state = "punished"
+	upgrade_to = SPECIES_WINGS_MOTH //through TG code moth wings aren't meant to get upgraded if they're burnt off but...
 
 /datum/sprite_accessory/deco_wings/ragged
 	name = "Ragged"
 	icon_state = "ragged"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/reddish
 	name = "Reddish"
 	icon_state = "redish"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/rosy
 	name = "Rosy"
 	icon_state = "rosy"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/royal
 	name = "Royal"
 	icon_state = "royal"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/snow
 	name = "Snow"
 	icon_state = "snow"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/whitefly
 	name = "White Fly"
 	icon_state = "whitefly"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/deco_wings/witchwing
 	name = "Witch Wing"
 	icon_state = "witchwing"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 //INSECT WINGS
 
@@ -220,67 +364,86 @@
 	icon = 'icons/mob/wings.dmi'
 	color_src = WINGCOLOR
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
+	var/list/upgrade_to = list()
+
+/datum/sprite_accessory/insect_wings/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
+	return (H.dna.features["wings"] != "None") //true wings will override decorative wings
 
 //non insect wings
-/datum/sprite_accessory/deco_wings/bat
+/datum/sprite_accessory/insect_wings/bat
 	name = "Bat"
 	icon_state = "bat"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/insect_wings/bee
 	name = "Bee"
 	icon_state = "bee"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/insect_wings/bee2
 	name = "Small Bee"
 	icon_state = "beewings"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/insect_wings/dragon
 	name = "Dragon"
 	icon_state = "dragon"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/insect_wings/dragonfly
 	name = "Dragonfly"
 	icon_state = "dragonfly"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/insect_wings/fairy
 	name = "Fairy"
 	icon_state = "fairy"
+	upgrade_to = SPECIES_WINGS_INSECT
 
 /datum/sprite_accessory/insect_wings/featheredwing
 	name = "Feathery"
 	icon_state = "feathery"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/insect_wings/featheredwingmedium
 	name = "Medium Feathered"
 	icon_state = "feathered3"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/insect_wings/featheredwinglarge
 	name = "Large Feathered"
 	icon_state = "feathered2"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/insect_wings/harpywings
 	name = "Harpy"
 	icon_state = "harpywings"
+	upgrade_to = SPECIES_WINGS_ANGEL
 
 /datum/sprite_accessory/insect_wings/roboticwing
 	name = "Robotic"
 	icon_state = "drago"
+	upgrade_to = SPECIES_WINGS_ROBOT
 
 /datum/sprite_accessory/insect_wings/succubusblack
 	name = "Succubus Black"
 	icon_state = "succubusblack"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/insect_wings/succubuspurple
 	name = "Succubus Purple"
 	icon_state = "succubuspurple"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/insect_wings/succubusred
 	name = "Succubus Red"
 	icon_state = "succubusred"
+	upgrade_to = SPECIES_WINGS_DRAGON
 
 /datum/sprite_accessory/insect_wings/xenobackplate
 	name = "Xenomorph Backplate"
 	icon_state = "snagbackplate"
+	upgrade_to = list()
 
 //moth wings
 
@@ -288,98 +451,122 @@
 	name = "None"
 	icon_state = "none"
 	relevant_layers = null
+	upgrade_to = list()
 
 /datum/sprite_accessory/insect_wings/atlas
 	name = "Atlas"
 	icon_state = "atlas"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/brown
 	name = "Brown"
 	icon_state = "brown"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/deathhead
 	name = "Deathshead"
 	icon_state = "deathhead"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/featherymoth
 	name = "Feathery Moth Wings"
 	icon_state = "featherymoth"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/firewatch
 	name = "Firewatch"
 	icon_state = "firewatch"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/gothic
 	name = "Gothic"
 	icon_state = "gothic"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/jungle
 	name = "Jungle"
 	icon_state = "jungle"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/lovers
 	name = "Lovers"
 	icon_state = "lovers"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/luna
 	name = "Luna"
 	icon_state = "luna"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/monarch
 	name = "Monarch"
 	icon_state = "monarch"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/moonfly
 	name = "Moon Fly"
 	icon_state = "moonfly"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/oakworm
 	name = "Oak Worm"
 	icon_state = "oakworm"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/plain
 	name = "Plain"
 	icon_state = "plain"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/plasmafire
 	name = "Plasma Fire"
 	icon_state = "plasmafire"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/poison
 	name = "Poison"
 	icon_state = "poison"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/punished
 	name = "Burnt Off"
 	icon_state = "punished"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/ragged
 	name = "Ragged"
 	icon_state = "ragged"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/reddish
 	name = "Reddish"
 	icon_state = "redish"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/rosy
 	name = "Rosy"
 	icon_state = "rosy"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/royal
 	name = "Royal"
 	icon_state = "royal"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/snow
 	name = "Snow"
 	icon_state = "snow"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/whitefly
 	name = "White Fly"
 	icon_state = "whitefly"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 /datum/sprite_accessory/insect_wings/witchwing
 	name = "Witch Wing"
 	icon_state = "witchwing"
+	upgrade_to = SPECIES_WINGS_MOTH
 
 //insect markings
 /datum/sprite_accessory/insect_markings // Extra markings for insects ported from tg.
@@ -453,9 +640,11 @@
 /datum/sprite_accessory/deco_wings/eyestalks
 	name = "gazer eyestalks"
 	icon_state = "eyestalks"
+	upgrade_to = list() //and suddenly flight potions become a lot more awkward when they gouge your tentacle eyes out.
 	//ckeys_allowed = list("liquidfirefly","seiga") //At request.
 
 /datum/sprite_accessory/insect_wings/eyestalks
 	name = "gazer eyestalks"
 	icon_state = "eyestalks"
+	upgrade_to = list()
 	//ckeys_allowed = list("liquidfirefly","seiga") //At request.

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()