cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

floating movement type now stops slips (#67694)

Browse Source 
* float movement type now stops slips

* weh
This commit is contained in:
Fikou
2022-06-12 18:47:51 +02:00
committed by GitHub
parent d82e4adaab
commit 5be8bde77f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/slippery.dm
+1 -1
View File
@@ -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)
/*
code/game/turfs/open/_open.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/carbon_movement.dm
+1 -1
View File
@@ -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))