Merge pull request #10829 from Ghommie/Ghommie-cit544

Fixed and brutalized clown op slippery weapons a little.
2020-02-02 03:16:23 -07:00
parent 99dc1754af 7ce0369e48
commit 66a2216ef3
7 changed files with 62 additions and 61 deletions
@@ -13,8 +13,8 @@
 		. += SOFTCRIT_ADD_SLOWDOWN

 /mob/living/carbon/slip(knockdown_amount, obj/O, lube)
-	if(movement_type & FLYING)
-		return 0
+	if(movement_type & FLYING && !(lube & FLYING_DOESNT_HELP))
+		return FALSE
 	if(!(lube&SLIDE_ICE))
 		log_combat(src, (O ? O : get_turf(src)), "slipped on the", null, ((lube & SLIDE) ? "(LUBE)" : null))
 	return loc.handle_slip(src, knockdown_amount, O, lube)