Merge pull request #507 from Citadel-Station-13/upstream-merge-26408

[MIRROR] Conveyor movement refactor/fix

code/modules/mob/dead/dead.dm

@@ -10,3 +10,6 @@
 
 /mob/dead/gib()		//ghosts can't be gibbed.
 	return
+
+/mob/dead/ConveyorMove()	//lol
+	return

code/modules/mob/living/living.dm

@@ -926,3 +926,8 @@
 	if(riding_datum)
 		riding_datum.handle_vehicle_offsets()
 		riding_datum.handle_vehicle_layer()
+
+/mob/living/ConveyorMove()
+	if((movement_type & FLYING) && !stat)
+		return
+	..()

code/modules/mob/living/simple_animal/friendly/butterfly.dm

@@ -27,4 +27,4 @@
 /mob/living/simple_animal/butterfly/Initialize()
 	..()
 	var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
-	add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
+	add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)