Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-01-19 16:18:12 -07:00
parent a4e2591223 92ead7e65d
commit f85527ab4b
320 changed files with 5694 additions and 2936 deletions
@@ -374,7 +374,7 @@
 		return TRUE
 	return FALSE

-/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)