Merge pull request #9601 from Ghommie/Ghommie-cit265

Ports move force and move resist, movement/pushing/pulling tweaks & co.
This commit is contained in:
kevinz000
2020-01-19 16:10:56 -07:00
committed by Dip
parent 76f9c30103
commit b8bc551d51
120 changed files with 563 additions and 447 deletions
+1 -1
View File
@@ -337,7 +337,7 @@
. = TRUE
/obj/machinery/disposal/bin/hitby(atom/movable/AM)
/obj/machinery/disposal/bin/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
if(isitem(AM) && AM.CanEnterDisposals())
if(prob(75))
AM.forceMove(src)