diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index cddcd80610c..90a519b2a2f 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -4,6 +4,7 @@ to_chat(M, "You just [pick("ran", "slammed")] into \the [src]!") M.apply_damage(5, BRUTE) M.Weaken(2) + M.stop_flying() /obj/structure/table/stumble_into(mob/living/M) var/obj/occupied = turf_is_crowded() @@ -17,6 +18,7 @@ M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(get_turf(src)) + M.stop_flying() /obj/machinery/disposal/stumble_into(mob/living/M) playsound(get_turf(src), 'sound/effects/clang.ogg', 25, 1, -1) @@ -27,18 +29,21 @@ M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(src) + M.stop_flying() update() /obj/structure/inflatable/stumble_into(mob/living/M) playsound(get_turf(M), "sound/effects/Glasshit.ogg", 25, 1, -1) visible_message("[M] [pick("ran", "slammed")] into \the [src]!") M.Weaken(1) + M.stop_flying() /obj/structure/kitchenspike/stumble_into(mob/living/M) playsound(get_turf(M), "sound/weapons/pierce.ogg", 25, 1, -1) visible_message("[M] [pick("ran", "slammed")] into the spikes on \the [src]!") M.apply_damage(15, BRUTE, sharp=1) M.Weaken(5) + M.stop_flying() /obj/structure/m_tray/stumble_into(mob/living/M) playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1) @@ -46,6 +51,7 @@ M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(get_turf(src)) + M.stop_flying() /obj/structure/c_tray/stumble_into(mob/living/M) playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1) @@ -53,12 +59,14 @@ M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(get_turf(src)) + M.stop_flying() /obj/structure/window/stumble_into(mob/living/M) visible_message("[M] [pick("ran", "slammed")] into \the [src]!") M.apply_damage(5, BRUTE) M.Weaken(2) hitby(M) + M.stop_flying() /obj/structure/railing/stumble_into(mob/living/M) var/obj/occupied = turf_is_crowded() @@ -67,6 +75,7 @@ playsound(get_turf(src), 'sound/misc/slip.ogg', 25, 1, -1) visible_message("[M] [pick("tripped", "stumbled")] over \the [src]!") M.Weaken(2) + M.stop_flying() if(get_turf(M) == get_turf(src)) M.forceMove(get_step(src, src.dir)) else @@ -81,6 +90,7 @@ M.apply_damage(15, BURN) M.Weaken(5) M.emote("scream") + M.stop_flying() /obj/machinery/atmospherics/unary/cryo_cell/stumble_into(mob/living/M) if((stat & (NOPOWER|BROKEN)) || !istype(M, /mob/living/carbon) || occupant || M.abiotic() || !node) @@ -90,6 +100,7 @@ M.apply_damage(5, BRUTE) M.Weaken(2) put_mob(M) + M.stop_flying() /obj/machinery/porta_turret/stumble_into(mob/living/M) ..() @@ -119,6 +130,7 @@ update_icon() add_fingerprint(M) updateUsrDialog() + M.stop_flying() /obj/machinery/vending/stumble_into(mob/living/M) ..()