Merge pull request #305 from lbnesquik/FlyingTweaks

Buff flying

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -74,6 +74,8 @@ var/global/list/image/splatter_cache=list()
 		return
 	if(amount < 1)
 		return
+	if(perp.flying) //Flap flap. Chomp edit. Thanks KasparoVy 
+		return
 
 	var/obj/item/organ/external/l_foot = perp.get_organ("l_foot")
 	var/obj/item/organ/external/r_foot = perp.get_organ("r_foot")

code/game/objects/items/weapons/material/shards.dm

@@ -69,6 +69,9 @@
 		if(M.buckled) //wheelchairs, office chairs, rollerbeds
 			return
 
+		if(M.flying) //Flap flap. Chomp edit. Thanks KasparoVy  This is before the sound so you can fly stealthly. Plus why would there be a noise if you didn't touch.
+			return
+
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M

code/game/objects/stumble_into_vr.dm

@@ -7,6 +7,8 @@
 	M.stop_flying()
 
 /obj/structure/table/stumble_into(mob/living/M)
+	if(M.flying && !(M.confused || M.is_blind())) //If you're not flying, or you're flying confused/blind, take the tumble.
+		return
 	var/obj/occupied = turf_is_crowded()
 	if(occupied)
 		return ..()
@@ -45,6 +47,7 @@
 	M.Weaken(5)
 	M.stop_flying()
 
+//Morgue thing.
 /obj/structure/m_tray/stumble_into(mob/living/M)
 	playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1)
 	visible_message("<span class='warning'>[M] flopped onto \the [src]!</span>")
@@ -69,6 +72,8 @@
 	M.stop_flying()
 
 /obj/structure/railing/stumble_into(mob/living/M)
+	if(M.flying && !(M.confused || M.is_blind())) //If you're not flying, or you're flying confused/blind, take the tumble.
+		return
 	var/obj/occupied = turf_is_crowded()
 	if(occupied)
 		return ..()