From 5be8bde77ffd4eacf0290a58a6d97f2bd6ffac97 Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:47:51 +0200 Subject: [PATCH] floating movement type now stops slips (#67694) * float movement type now stops slips * weh --- code/datums/components/slippery.dm | 2 +- code/game/turfs/open/_open.dm | 2 +- code/modules/mob/living/carbon/carbon_movement.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 9301d558f14..6783cba004d 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -76,7 +76,7 @@ if(!isliving(arrived)) return var/mob/living/victim = arrived - if(!(victim.movement_type & FLYING) && victim.slip(knockdown_time, parent, lube_flags, paralyze_time, force_drop_items) && callback) + if(!(victim.movement_type & FLYING|FLOATING) && victim.slip(knockdown_time, parent, lube_flags, paralyze_time, force_drop_items) && callback) callback.Invoke(victim) /* diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 5e93cc1cf66..71fd7c52ae7 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -212,7 +212,7 @@ return TRUE /turf/open/handle_slip(mob/living/carbon/slipper, knockdown_amount, obj/O, lube, paralyze_amount, force_drop) - if(slipper.movement_type & FLYING) + if(slipper.movement_type & FLYING|FLOATING) return FALSE if(has_gravity(src)) var/obj/buckled_obj diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 419c203b60c..543ff20c1ac 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -1,5 +1,5 @@ /mob/living/carbon/slip(knockdown_amount, obj/O, lube, paralyze, force_drop) - if(movement_type & FLYING) + if(movement_type & FLYING|FLOATING) return FALSE if(!(lube&SLIDE_ICE)) log_combat(src, (O ? O : get_turf(src)), "slipped on the", null, ((lube & SLIDE) ? "(LUBE)" : null))