Conflict fix

2020-01-20 13:50:52 +02:00
parent 782125b339 0f4f07dc95
commit f5ad854c2c
373 changed files with 6548 additions and 3989 deletions
@@ -371,7 +371,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)