Merge remote-tracking branch 'citadel/master' into tgsync

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

@@ -138,6 +138,18 @@
 	name = "White Fly"
 	icon_state = "whitefly"
 
+/datum/sprite_accessory/deco_wings/oakworm
+	name = "Oak Worm"
+	icon_state = "oakworm"
+
+/datum/sprite_accessory/deco_wings/witchwing
+	name = "Witch Wing"
+	icon_state = "witchwing"
+
+/datum/sprite_accessory/deco_wings/jungle
+	name = "Jungle"
+	icon_state = "jungle"
+
 //INSECT WINGS
 
 /datum/sprite_accessory/insect_wings

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

@@ -380,6 +380,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 
 /mob/dead/observer/Move(NewLoc, direct)
+	if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, NewLoc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+		return
 	if(updatedir)
 		setDir(direct)//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
 	var/oldloc = loc